Merge branch 'master' into no-php
authorJack Allnutt <m2ys4u@Gmail.com>
Sat, 1 Oct 2011 09:00:27 +0000 (10:00 +0100)
committerJack Allnutt <m2ys4u@Gmail.com>
Sat, 1 Oct 2011 09:00:27 +0000 (10:00 +0100)

Trivial merge