Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 25 Oct 2008 22:41:34 +0000 (00:41 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 25 Oct 2008 22:41:34 +0000 (00:41 +0200)
commit71a2e02cf1b8523442ca67dffa34889ca708b836
treecfa8aab8afc7ab60fa9d1add90734040e0fd5052
parente72e2773c499a3b2538be71d8be59944a6b03007
parent7bea6684c23f34319feb393023e634b1f069f20f
Merge branch 'master' of ssh://git.samba.org/data/git/samba