Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 18:14:17 +0000 (20:14 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 18:14:17 +0000 (20:14 +0200)

Trivial merge