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)

Trivial merge