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)
commit6a43b5e895444235c869b008de98e4b21bcdcfd9
tree9c4d80b1cd7192419ca8ef2a56f1eafd2a29f075
parentb874f07175ae38a041f53f0e4ac6a4050dcefeae
parent80dbf04266d15833f7eb18704cfece1f95965e83
Merge branch 'v4-0-trivial' into v4-0-python

Conflicts:

source/scripting/python/config.m4