Merge branch 'master' of gitmo@jules.scsys.co.uk:Moose
Chris Prather [Fri, 27 Mar 2009 20:45:10 +0000 (16:45 -0400)]

Trivial merge