Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 15:14:16 +0000 (16:14 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 15:14:16 +0000 (16:14 +0100)
commitfda16c1c71ca84d5824173cc5fb3dafc84e7b67c
tree97e274d176c4ae7812b6fda2bdd698badd8f2dc6
parent46e3e84f1adb8dce5c823dfa4fae0ebd500d0e5f
parent91a7c8b01b498f06c29020452db96d5b5f2456c0
Merge branch 'master' of ssh://git.samba.org/data/git/samba