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

Trivial merge