Merge branch 'master' of ssh://git.samba.org/data/git/samba into wmi
authorJelmer Vernooij <jelmer@samba.org>
Mon, 15 Sep 2008 16:03:45 +0000 (18:03 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 15 Sep 2008 16:03:45 +0000 (18:03 +0200)

Trivial merge