merge of '3f2a27262036d4f6ceb75b07aa81c14e4b0fdcf0'
authorPhilip Balister <philip@balister.org>
Sun, 12 Aug 2007 15:28:32 +0000 (15:28 +0000)
committerPhilip Balister <philip@balister.org>
Sun, 12 Aug 2007 15:28:32 +0000 (15:28 +0000)
     and '6b3dffb49893e57cc4d29e223fbea38df4937659'


Trivial merge