Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 19:03:35 +0000 (11:03 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 21 Feb 2008 19:03:35 +0000 (11:03 -0800)
commit9dabde1f3e5ba3d98e4e02d8c2a0706dc4f48c18
tree545a1eeab7aa0d8b486264bc9226497376f659e6
parentbeb0a76b93f9dd054dbc4192516e7008e59b27d9
parenta2230ccc1700af02f5a5caedd2e66e6f4c14bb5c
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test