Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Thu, 29 May 2008 20:45:58 +0000 (15:45 -0500)
committerJohn H Terpstra <jht@samba.org>
Thu, 29 May 2008 20:45:58 +0000 (15:45 -0500)
1  2 
WHATSNEW.txt

diff --cc WHATSNEW.txt
Simple merge