Merge branch 'master' of git.shadowcat.co.uk:SDL-Site
Kartik Thakore [Mon, 23 Nov 2009 21:16:40 +0000 (16:16 -0500)]

Trivial merge