Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 25 Feb 2009 11:49:37 +0000 (12:49 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 25 Feb 2009 11:49:37 +0000 (12:49 +0100)
commit258ae4cec596631b758fb17c170c4494e4db8a8e
tree5c9ef9246eef3af3b744e862d0e5314a4686304e
parentfff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf
parenta041d9061922b1a90e5b5047af77934d908afdd5
Merge branch 'master' of ssh://git.samba.org/data/git/samba

Conflicts:
source4/scripting/python/samba/provision.py
source4/scripting/python/samba/provision.py