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)
commitbc2973df8504850a40cb0a1172689dc0bdafa323
tree26434551a67588f6f613660f625f05f54d9f646d
parentafccc9703c45815f94dd05805a060d71b7fe618a
parenta33d0797585b5cdd304ac1eb6966b9c7c799bab6
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test