Merge commit 'origin/v3-2-test' into v3-2-simo
authorSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:54:50 +0000 (17:54 -0500)
committerSimo Sorce <idra@samba.org>
Wed, 5 Dec 2007 22:54:50 +0000 (17:54 -0500)
commit47ababfa0353549b0317d297ed79f905ffd6e7f5
tree8fd953d769353fb94f2b1105b98209526876a53d
parent7f2ec207796bfcf92fc3bdd3b868337c343328a3
parent1938e861d0081fd5a28b8b345df70f22b3d841a5
Merge commit 'origin/v3-2-test' into v3-2-simo
(This used to be commit 1b133d111596f7fb6a42e526ab69f621df97956a)