Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 12 Jan 2008 06:38:42 +0000 (22:38 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 12 Jan 2008 06:38:42 +0000 (22:38 -0800)
commit08645826817d42c9d4b42ea0fd5e633d7fd08d35
tree18b61b91fca95afa311c6b513ac3bf466bd5a614
parent87456d8eefe630ab6ac685524c4560a71764ea96
parent57368f883fb217b4196858bb2255c0eea59a8917
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test