Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAndrew Tridgell <tridge@samba.org>
Wed, 23 Jan 2008 02:08:14 +0000 (13:08 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 23 Jan 2008 02:08:14 +0000 (13:08 +1100)
commit39d172bf34d0cbb3bf3e3a04d534876097cdccb5
tree3a32fd867e34c9a86c3a2f01308445b76bf2d50c
parent2caa0e82f5ff2f45a5c912c624e54c4a43f0c3cc
parent9051199e40dec27d3532fbec7f5744033def1874
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit bc2973df8504850a40cb0a1172689dc0bdafa323)