Merge ../powerpc-merge
authorPaul Mackerras <paulus@samba.org>
Tue, 28 Feb 2006 05:35:24 +0000 (16:35 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 28 Feb 2006 05:35:24 +0000 (16:35 +1100)

Trivial merge