Merge remote-tracking branch 'lapilofu/hotfix/manifest' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 8 Oct 2011 01:07:09 +0000 (18:07 -0700)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Sat, 8 Oct 2011 01:07:09 +0000 (18:07 -0700)

Trivial merge