Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 18 Sep 2008 16:41:23 +0000 (18:41 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 18 Sep 2008 16:41:23 +0000 (18:41 +0200)

Trivial merge