Merge branch 'master' of git.shadowcat.co.uk:SDL-Site
Kartik Thakore [Fri, 4 Dec 2009 20:05:57 +0000 (15:05 -0500)]

Trivial merge