Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 2 Nov 2008 23:15:27 +0000 (00:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 2 Nov 2008 23:15:27 +0000 (00:15 +0100)

Trivial merge