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

Trivial merge