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)
commit5fe26d6bfc6b5153b2ab97bfffb3c57257feddd6
tree17c4f0fb5a8fa0e4a4fcc03392f8dfeec52483cc
parentf59d7f1e9b3851dd86acf9d46096ca8de6fad540
parentbed1f1037a4dfe6368c81ea2e2a0ac32f56126ce
Merge branch 'bugs'