Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 26 Aug 2008 06:27:10 +0000 (16:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 26 Aug 2008 06:27:10 +0000 (16:27 +1000)
commitd7db5fe161429163a19d18c7e3045939897b9b2a
tree4059f9a17c41b91e9c69d2f824474dbac512b6df
parent8e1285a1ee60e3d3b7352ab7269d535c41916b46
parentd94c7bbcd6eee6d975eac32a1d172f4164c97137
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet