Merge branch 'master' of ssh://git.samba.org/data/git/samba into xmaster
authorJelmer Vernooij <jelmer@samba.org>
Sat, 18 Oct 2008 13:37:57 +0000 (15:37 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 18 Oct 2008 13:37:57 +0000 (15:37 +0200)

Trivial merge