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

Trivial merge