Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry
authorJelmer Vernooij <jelmer@samba.org>
Fri, 19 Dec 2008 12:03:17 +0000 (12:03 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 19 Dec 2008 12:03:17 +0000 (12:03 +0000)
commit263036a798b4c431f03dae20d33f90585d2b0cab
tree1a8af7fae50ac0b81fb0da9149b1eb92fb2706b0
parente0672ae29bcd345bdf0fec96844f658ffd941039
parentf87da49830960aebe4ffa551e7e1f16330d28cca
Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry