Merge branch 'master' of git.shadowcat.co.uk:SDL-Site
Tobias Leich [Fri, 13 Nov 2009 20:43:41 +0000 (21:43 +0100)]

Trivial merge