Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 15:51:30 +0000 (17:51 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 15:51:30 +0000 (17:51 +0200)
commitd805c714bb79a709716ec0373670283bfcd23c3c
treefc33a2256c0fe999ccd4a9f4a6858790fa843766
parentcf659fa4fe7369ac58ef547f744c0ff3f9fb137a
parent097f40249c664cfc76794894440e27496ab82a76
Merge branch 'master' of ssh://git.samba.org/data/git/samba