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)
commitec1c854f2175823bd1ad39c2e272d1b3fab80bf1
treebb2946e678ce5f5e761f11299abca0179d65913a
parent0016bc40918fb6de71c670b3dd93934690dcee4f
parent4dfa72423ef96b411e797eb1b5b4cb3ebd8e3d32
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wmi