merge of '8104662b136ce70b58ae47f1c87a35fb7a8e242c'
authorPhilip Balister <philip@balister.org>
Fri, 23 May 2008 18:16:18 +0000 (18:16 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 23 May 2008 18:16:18 +0000 (18:16 +0000)
     and 'ba423ff965670136ffbda3d58e4debf5c627ce3b'


Trivial merge