Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
authorJeremy Allison <jra@samba.org>
Fri, 16 Jan 2009 20:25:35 +0000 (12:25 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 16 Jan 2009 20:25:35 +0000 (12:25 -0800)
commitd03133e696aea45e0843f4d72d2d1449366ac4e2
tree4e0765b2d9f7f65b0697e29e9cd35184abb22cde
parentfb904194c9f696b72d862e51e7ba688decdda192
parent073e9f42f0c5f5de5d736ec7843d80a274c891ce
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba