merge of '05dd48c35e7fc8bd8ec725a975682953f4e2eb8b'
authorPhilip Balister <philip@balister.org>
Fri, 8 Aug 2008 22:01:58 +0000 (22:01 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 8 Aug 2008 22:01:58 +0000 (22:01 +0000)
     and 'e5d51ef06db323f64e81b4277041a3eb479eda1b'


Trivial merge