merge of '77248faae336ad5f2532155f6855f3432b14ff29'
authorPhilip Balister <philip@balister.org>
Fri, 23 May 2008 18:16:06 +0000 (18:16 +0000)
committerPhilip Balister <philip@balister.org>
Fri, 23 May 2008 18:16:06 +0000 (18:16 +0000)
     and '7cf3999d32b721cc9cea1f3206f20979063615b8'


Trivial merge