Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 00:34:38 +0000 (02:34 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 00:34:38 +0000 (02:34 +0200)
commit4c81727a003e4c49c314e0c5a1b4584b8825e7fe
tree8267f7e5dca6b82984b51cca9735dc9d1e5852e6
parenta62c510d8b3f5e15bd48f71747c5f516eca570c7
parent501fa6a05db1b2c29b1e4720a03ed219aee2a346
Merge branch 'master' of git://git.samba.org/samba