Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 21:11:30 +0000 (23:11 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 21:11:30 +0000 (23:11 +0200)

Trivial merge