Merge branch 'v4-0-stable'
authorJelmer Vernooij <jelmer@samba.org>
Mon, 19 Jan 2009 19:17:23 +0000 (20:17 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 19 Jan 2009 19:17:23 +0000 (20:17 +0100)
1  2 
WHATSNEW4.txt

diff --cc WHATSNEW4.txt
Simple merge