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

Trivial merge