Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Tue, 15 Jan 2008 13:58:47 +0000 (13:58 +0000)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Tue, 15 Jan 2008 13:58:47 +0000 (13:58 +0000)

Trivial merge