merge of '79c49ff1a9299d8a641388c72a0621d630dbe546'
authorPhilip Balister <philip@balister.org>
Thu, 18 Jan 2007 15:56:52 +0000 (15:56 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 18 Jan 2007 15:56:52 +0000 (15:56 +0000)
     and 'dc8e9f14090e27ec92cc64dfad0c964cb44f5da5'


Trivial merge