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