Merge ../powerpc-merge
authorPaul Mackerras <paulus@samba.org>
Fri, 24 Feb 2006 03:05:47 +0000 (14:05 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 24 Feb 2006 03:05:47 +0000 (14:05 +1100)

Trivial merge