Merge branch 'master' of git.shadowcat.co.uk:SDL-Site
kthakore [Wed, 27 Oct 2010 05:26:08 +0000 (01:26 -0400)]

Trivial merge