merge of '3ff3791f6f88919a909fbe4ecd9ea923278b08e6'
authorPhilip Balister <philip@balister.org>
Wed, 23 May 2007 14:28:29 +0000 (14:28 +0000)
committerPhilip Balister <philip@balister.org>
Wed, 23 May 2007 14:28:29 +0000 (14:28 +0000)
     and '6e33c7fc6b6fce6ae3708fa63940a13147ac87e3'


Trivial merge