Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jan 2008 02:30:21 +0000 (02:30 +0000)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jan 2008 02:30:21 +0000 (02:30 +0000)
(This used to be commit 4ff2101c69a0cfcfdc5f775493cb6e88c57e4bbe)


Trivial merge