Merge branch 'master' of p5sagit@git.shadowcat.co.uk:Oyster
Paul Tipper [Sat, 20 Nov 2010 19:01:46 +0000 (19:01 +0000)]

Trivial merge