Merge branch 'v4-0-trivial' into v4-0-python
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:06:54 +0000 (20:06 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 19:06:54 +0000 (20:06 +0100)
commitec106a14216ee034b7e04c177c89703e63dfd107
tree59c56cd663ee3dc03d0ce63bf4405ee87c14834a
parent4075a2ba982ea56ff925e0a33839f0760fd71911
parent1a2544a24c064e9eecb973439ccd0e7126e06e77
Merge branch 'v4-0-trivial' into v4-0-python
(This used to be commit b874f07175ae38a041f53f0e4ac6a4050dcefeae)
source4/scripting/python/config.m4