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

Trivial merge