Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into samba-3-2...
authorJeremy Allison <jra@samba.org>
Thu, 13 Nov 2008 03:28:04 +0000 (19:28 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 13 Nov 2008 03:28:04 +0000 (19:28 -0800)
commit5ac6671cb24d8677b0db0508e85a6038baa9d54b
tree77e166c28ebb9dc94e2319091316b4ee9e6b4e40
parentddd3e0524707d732143c1fb831c1ce2bf67dc2bf
parenta2b17597ea4ad171411a972ba4aa0c14b0f2b058
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into samba-3-2-test