Merge branch 'v4-0-trivial' into v4-0-python
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:38:07 +0000 (20:38 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:38:07 +0000 (20:38 +0100)
Conflicts:

source/scripting/python/config.m4


No differences found