Merge branch 'master' of gitmo@jules.scsys.co.uk:Moose
Shawn M Moore [Thu, 25 Jun 2009 17:49:20 +0000 (13:49 -0400)]

Trivial merge