Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Fri, 11 Sep 2009 11:44:02 +0000 (21:44 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 11 Sep 2009 11:44:02 +0000 (21:44 +1000)
commit2eb61efd1f050696a7835cfc5c7af96bbcb9708e
tree492069246bf8af0b305c3315551991d633ed198e
parentbae320e2aac91839fd2c331e1ad719cb1b4de599
parentf74e8c266f43d0c640ab8068d28a1b197164d548
Merge branch 'master' of ssh://git.samba.org/data/git/samba