merge of '4bbce1b1f23b34445cc85ab8c7fa08737f26602a'
authorPhilip Balister <philip@balister.org>
Fri, 3 Aug 2007 14:31:39 +0000 (14:31 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 3 Aug 2007 14:31:39 +0000 (14:31 +0000)
     and '582846d2ab5b93f2ea68455a2d13d90c4ca2fe12'


Trivial merge