Merge branch 'master' of git.shadowcat.co.uk:SDL-Site
Kartik Thakore [Sat, 14 Nov 2009 23:29:53 +0000 (18:29 -0500)]

Trivial merge