Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 21:11:30 +0000 (23:11 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 21:11:30 +0000 (23:11 +0200)
commit2121c1bb2967f0aa8cc6903c507eb2c22a25b341
tree3428e62ed9dfe9643c10fe5f0066916166b4f69a
parentafa850910ff7845b2c8b19fdcf6fbb703e42d2db
parent73aebd7d070099d4d6d6da98817f42937bc7fd03
Merge branch 'master' of ssh://git.samba.org/data/git/samba