Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Tue, 8 May 2007 03:37:51 +0000 (13:37 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 8 May 2007 03:37:51 +0000 (13:37 +1000)

Trivial merge