Merge branch 'master' into julian
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 9 Feb 2011 15:30:58 +0000 (10:30 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 9 Feb 2011 15:30:58 +0000 (10:30 -0500)

Trivial merge