Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
authorSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 20:26:16 +0000 (15:26 -0500)
committerSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 20:26:16 +0000 (15:26 -0500)
commite940537d5be870ae622712a3b76dff891739df8c
treed352858bcd56bda8e0b31a1fe6d6cb60f017560e
parent814c1b0e0034fb67c7718760dfcf913904f3e7fa
parent545cd2139cfc9484b733693814d4724d37125942
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo