Merge branch 'master' of catagits@git.shadowcat.co.uk:Web-Simple
Arthur Axel 'fREW' Schmidt [Fri, 27 Nov 2009 17:04:18 +0000 (11:04 -0600)]

Trivial merge