merge of '464670c02b54fd9487f739c1b471a0ea8e63bd90'
authorPhilip Balister <philip@balister.org>
Mon, 17 Mar 2008 12:14:49 +0000 (12:14 +0000)
committerPhilip Balister <philip@balister.org>
Mon, 17 Mar 2008 12:14:49 +0000 (12:14 +0000)
     and '7bf3ddcba37e60f65ee490010fa2b5a941510de0'


Trivial merge