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)
commit7979cae206cd1e1e352f32fba6165aa3b56f4add
treeb6d25f20786fbd47a0a98d81784988e5d9f30c11
parent47b26ef57c57cfe2b6c9acf90af785c0b2e73404
parent9c455879f02606127686cde50552af53ccff8cb8
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wmi