Merge branch 'v4-0-trivial' of /home/jelmer/samba4 into upstream
authorJelmer Vernooij <jelmer@samba.org>
Sun, 20 Jan 2008 15:37:55 +0000 (16:37 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 20 Jan 2008 15:37:55 +0000 (16:37 +0100)
commit1fc551b1056c784070fab8dc67596560362360db
treecc87e767827b011056256fa0840a35c8f747d42c
parent8384e455a8046105046b74fe6f652ddbe0423081
parent708cc56a9fae970edf61ce4c983dd746962c9333
Merge branch 'v4-0-trivial' of /home/jelmer/samba4 into upstream

Conflicts:

source/lib/nss_wrapper/config.mk