Merge branch 'v4-0-test' of /home/jelmer/samba4
commit1d59fd4d733007ccabb69c945e1da2208c376b96
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 13:07:38 +0000 (21 14:07 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 13:07:38 +0000 (21 14:07 +0100)
treec9e7cd077b232c781ba1fc28f326998fba6669e0
parentb64b78e4cc2aaed779a07dbcb180323bfb3652d6
parent11a25f90500b64f4b43907f6f311dc5e9731da39
Merge branch 'v4-0-test' of /home/jelmer/samba4