Merge branch 'optimization' into better_cache
authorStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 24 Jun 2011 17:09:56 +0000 (13:09 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Fri, 24 Jun 2011 17:09:56 +0000 (13:09 -0400)

Trivial merge