Merge branch 'master' of gitmo@jules.scsys.co.uk:Moose
Dave Rolsky [Thu, 11 Jun 2009 08:02:01 +0000 (03:02 -0500)]

Trivial merge