Merge branch 'master' of jules.scsys.co.uk:Moose
Rafael Kitover [Wed, 10 Feb 2010 20:09:19 +0000 (15:09 -0500)]

Trivial merge