Merge branch 'master' of gitmo@jules.scsys.co.uk:Moose
Chris Prather [Fri, 27 Mar 2009 22:17:07 +0000 (18:17 -0400)]

Trivial merge