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

Trivial merge