Merge branch 'master' of gitmo@jules.scsys.co.uk:Moose
Dave Rolsky [Fri, 13 Mar 2009 16:49:27 +0000 (11:49 -0500)]

Trivial merge