Merge branch 'nodiscard' of /home/jelmer/samba4
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 14:39:15 +0000 (15:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 15 Mar 2009 14:39:15 +0000 (15:39 +0100)

Trivial merge