Merge branch 'for-2.6.23' into merge
authorPaul Mackerras <paulus@samba.org>
Wed, 11 Jul 2007 03:28:26 +0000 (13:28 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 11 Jul 2007 03:28:26 +0000 (13:28 +1000)

Trivial merge