Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 14:58:35 +0000 (16:58 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 14:58:35 +0000 (16:58 +0200)
commitd14244459243ec317438bb0bb06fad0094d1a5e2
treee0df9ad00cca486e5559d08654bbeb7e0509619c
parentd53ff689a39ebd8b6b5dc9a13b9234ab2c8160e5
parentea4f764322fb3256ca11d0e206f1b39ed3c03c7c
Merge branch 'master' of git://git.samba.org/samba