Merge branch 'master' of gitmo@jules.scsys.co.uk:Moose
Stevan Little [Sat, 21 Mar 2009 00:28:09 +0000 (20:28 -0400)]

Trivial merge