Merge branch 'master' of gitmo@jules.scsys.co.uk:Moose
Chris Prather [Wed, 29 Apr 2009 06:03:15 +0000 (02:03 -0400)]

Trivial merge