Merge branch 'bugs'
authorSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 21:53:25 +0000 (22:53 +0100)
committerSimon McVittie <http://smcv.pseudorandom.co.uk/>
Sat, 12 Jul 2008 21:53:25 +0000 (22:53 +0100)

Trivial merge