Merge branch 'master' of git.shadowcat.co.uk:SDL-Site
Kartik Thakore [Fri, 27 Nov 2009 18:43:35 +0000 (13:43 -0500)]

Trivial merge