Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 15:48:25 +0000 (17:48 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 15:48:25 +0000 (17:48 +0200)
commit4c6174557384ff6c022872dd4f2bf2ddacfd3b63
tree36de32132f0ecb43638d873a9eb45eacbf7cf485
parentada0e343b2225471a8e623aca7d9aa314857af6c
parent11ecd5acfdd2af476e03b2818f218e7fbc4d3414
Merge branch 'master' of git://git.samba.org/samba