Merge branch 'master' of git.shadowcat.co.uk:SDL-Site
Tobias Leich [Sat, 14 Nov 2009 23:22:26 +0000 (00:22 +0100)]

Trivial merge