Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
authorJelmer Vernooij <jelmer@samba.org>
Tue, 9 Sep 2008 17:27:00 +0000 (19:27 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 9 Sep 2008 17:27:00 +0000 (19:27 +0200)
commitc82f268a1c1c5eff1cbdb410da3c717464bdbdd7
tree00f3aaee7050f96229d3a74b052ca1edf7e5e2b9
parent372ecdfde372a8bdd666cdf009262776eddd28d4
parent7965249bd613eb41eeca24ba8271189e2f90257c
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
(This used to be commit c3d1b0097590566417bda3fa33a64e994c9c7526)