Merge branch 'master' into julian
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 21 Feb 2011 14:33:29 +0000 (09:33 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 21 Feb 2011 14:33:29 +0000 (09:33 -0500)

Trivial merge