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)
commitb874f07175ae38a041f53f0e4ac6a4050dcefeae
tree9c4d80b1cd7192419ca8ef2a56f1eafd2a29f075
parent2f57e25f8f692889d9e057e13256f8a24c5ec10c
parente4d7cd8ba77aa05c11dad457c3f2c2c6252c5966
Merge branch 'v4-0-trivial' into v4-0-python
source/scripting/python/config.m4