Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
authorJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 00:32:19 +0000 (02:32 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 21 Sep 2008 00:32:19 +0000 (02:32 +0200)
commit442d31c7f699628a603ee3bef3831441b43afb69
treede39e7e9bcc74f45ec521d663bb4321e19afb1f8
parentf63c83deef52afcbe27c1664031a5eed009f3a44
parent0e2928f94651c53d653a3ad83bbda5608b4d4c24
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs