Merge commit 'origin/v3-2-test' into v3-2-simo
commit1b133d111596f7fb6a42e526ab69f621df97956a
authorSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:54:50 +0000 (5 17:54 -0500)
committerSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:54:50 +0000 (5 17:54 -0500)
tree1a279fe8be4563b60c495f4cc3a64ad45fceed2e
parent05bca093d107609f236928f338e2512a628c2c91
parent71770b4c1d021d829deeb53a6ea3b747fce55c84
Merge commit 'origin/v3-2-test' into v3-2-simo