merge of 'a1c5133ec8dfc7768c8883c8aa89593ce01f57cb'
authorPhilip Balister <philip@balister.org>
Thu, 26 Jun 2008 14:28:18 +0000 (14:28 +0000)
committerPhilip Balister <philip@balister.org>
Thu, 26 Jun 2008 14:28:18 +0000 (14:28 +0000)
     and 'fb432a3c848fb8f9a30c288a565d9490a1d9b318'


Trivial merge