Merge branch 'master' of ssh://git.samba.org/data/git/samba into wmi
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 05:54:49 +0000 (07:54 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 05:54:49 +0000 (07:54 +0200)

Trivial merge