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

Trivial merge