Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
commitd9498aaf1b931763eac561e8601fa6ef2db01742
authorAndrew Bartlett <abartlet@samba.org>
Fri, 19 Jun 2009 05:38:33 +0000 (19 15:38 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 19 Jun 2009 05:38:33 +0000 (19 15:38 +1000)
tree2e97691de11f44799ef30592cbf19057c4158744
parentec47444a7ea33e6417bac472c863b43db5baeaae
parent4c23a9556536561f79fa90bc431fc62fcc4e3c90
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel