Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 18:50:59 +0000 (20:50 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 18:50:59 +0000 (20:50 +0200)
commit215b84903ed202e69241d9fd9494fdc95e911efc
treeadb66c63498eb1c3e2e165684a123207c9d5c5d3
parent09065795d6e5c48a8b3b536224552f18d68cfb84
parent7577d9ebf06fcdb630b2cdaab8772a6da9e37b70
Merge branch 'master' of git://git.samba.org/samba