Merge branch 'master' of sdlgit@git.shadowcat.co.uk:SDL-Site
Kartik Thakore [Sat, 20 Feb 2010 17:15:57 +0000 (12:15 -0500)]

Trivial merge