Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 22 Feb 2008 21:38:03 +0000 (13:38 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 22 Feb 2008 21:38:03 +0000 (13:38 -0800)
commit49a367ed32a98c9bf48addfa3a4e16c1d6e444ff
treee9430b7bfca330050e0d040b583bba8893415643
parent5df1d8d550d66b1e52219bd15d24af5146c55ceb
parentd88e40106f2864e0e105b5d4fe7c25c577df8643
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit bcc5371b8e7f369e8d830d9cf687089514997248)