Merge branch 'master' of git.shadowcat.co.uk:Oyster
hakim [Sat, 20 Nov 2010 17:21:55 +0000 (17:21 +0000)]

Trivial merge