Merge branch 'linux-2.6'
authorPaul Mackerras <paulus@samba.org>
Thu, 10 May 2007 11:08:37 +0000 (21:08 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 10 May 2007 11:08:37 +0000 (21:08 +1000)

Trivial merge