Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 11:28:31 +0000 (03:28 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 28 Feb 2008 11:28:31 +0000 (03:28 -0800)
1  2 
WHATSNEW.txt

diff --cc WHATSNEW.txt
Simple merge