Merge branch 'master' of gitmo@jules.scsys.co.uk:gitosis-admin
Matt S Trout [Thu, 28 May 2009 13:30:40 +0000 (14:30 +0100)]

Trivial merge