Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
authorJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 08:53:56 +0000 (10:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 08:53:56 +0000 (10:53 +0200)
commit221ea78e2e1688f2e79703784b3d1d1a68057604
treeedc1393f9df46c65deaa509d99105f2906fd00cb
parentc3d8f472e8acbfd73fdd4707f70a3d153f62f033
parentc4dc548171ba27b741669e364839a3c8e507be96
Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt