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)
commitbcc5371b8e7f369e8d830d9cf687089514997248
tree1112e68ee0d6096748b25d42601c2b65b0a20a1b
parent9dabde1f3e5ba3d98e4e02d8c2a0706dc4f48c18
parentce57d388251063c22f89680e9d1c2129d9879975
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test