Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
commit77abc2dabd0477bf283793389da5add19aa42de1
authorJeremy Allison <jra@samba.org>
Thu, 8 Oct 2009 17:01:51 +0000 (8 10:01 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 8 Oct 2009 17:01:51 +0000 (8 10:01 -0700)
treefee4af8e97dd736d6a4985182803059e928b746f
parent46d193324082000f19221f1b1ac679512aff96ed
parentfb7096a55bb7873965797feee72ceef2404d689d
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba