Merge branch 'master' of sdlgit@git.shadowcat.co.uk:SDL-Site
kthakore [Wed, 1 Sep 2010 19:29:31 +0000 (19:29 +0000)]

Trivial merge