Merge Paulus' tree
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2005 07:15:43 +0000 (18:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2005 07:15:43 +0000 (18:15 +1100)

Trivial merge