Merge Stephen Rothwell's patches
authorPaul Mackerras <paulus@samba.org>
Wed, 28 Sep 2005 11:11:41 +0000 (21:11 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 28 Sep 2005 11:11:41 +0000 (21:11 +1000)

Trivial merge