Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 00:54:39 +0000 (02:54 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 00:54:39 +0000 (02:54 +0200)
commitd6e5204807fcd5a84b8b3b5d3717d352f6852b22
treec07dec84d4050f5f64e319e0ad00767faf78111d
parentaaa3e0425d8394c36a6211ddbd76837b5b3e3e56
parent16bbfc22629ea9e9aebc6164cae28a6b031cd9e0
Merge branch 'master' of git://git.samba.org/samba