Merge with Paulus
authorMichael Ellerman <michael@ellerman.id.au>
Fri, 4 Nov 2005 01:12:52 +0000 (12:12 +1100)
committerMichael Ellerman <michael@ellerman.id.au>
Fri, 4 Nov 2005 01:12:52 +0000 (12:12 +1100)

Trivial merge