Merge branch 'master' of ssh://git.samba.org/data/git/samba into pyregistry
authorJelmer Vernooij <jelmer@samba.org>
Thu, 18 Dec 2008 14:54:57 +0000 (14:54 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 18 Dec 2008 14:54:57 +0000 (14:54 +0000)

Trivial merge