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 14:41:43 +0000 (14:41 +0000)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jan 2008 14:41:43 +0000 (14:41 +0000)
(This used to be commit aebecd7462733b56457540423354ba249fd52808)


Trivial merge