Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
authorJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 00:32:19 +0000 (02:32 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 00:32:19 +0000 (02:32 +0200)

Trivial merge