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)
commit9788383a6c08189564cd18a824aab4ccdbe57a21
treee93ab7b1007d79e951f69a1495ac7e474536eb25
parent011e89c85868ec8f16e475a560a0e5bd41995920
parent97f61b542c0e6b1f25ed08fa36792fd90a981e0e
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 3a61e663e51fe620225691bc8673bf8800a36f47)