Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 7 Aug 2009 03:08:35 +0000 (13:08 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 7 Aug 2009 03:08:35 +0000 (13:08 +1000)
commit37b8235afe4036f7defd9465ae431cae9804fa18
treed62fd2f9b73c3c27bae1054b01c4cde7f3649ac1
parent11ff224e13a26e4ff9fbd01dec395262aac0f9f9
parent457191e9f396898b8a511cf860f24986f36fd879
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel