Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
authorSimo Sorce <idra@samba.org>
Wed, 16 Jan 2008 17:06:34 +0000 (12:06 -0500)
committerSimo Sorce <idra@samba.org>
Wed, 16 Jan 2008 17:06:34 +0000 (12:06 -0500)
commit04b2a9e80a8c35e37faf2e0a8e54efb9a084f2e3
tree9cb49347eab028a5f65a4f2aa4c61de42cff08fd
parent94fdd59f1c2a41b8e737aa8ca8939e9bf2b59a77
parent8c41366a98ea96224adc2c108b940075431944fd
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
(This used to be commit 05c22a55a4c052c682a2f2afdb0696504195d18c)