Merge commit 'origin/master'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Fri, 28 Aug 2009 14:55:28 +0000 (15:55 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Fri, 28 Aug 2009 14:55:28 +0000 (15:55 +0100)

Trivial merge