Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Tue, 21 Apr 2009 13:19:50 +0000 (15:19 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 21 Apr 2009 13:19:50 +0000 (15:19 +0200)
commit9b33766fbb13fc2ab82e209607db37f5888ddc2b
treec767a5ad36db87beb2d4076845f9bd48d22a8cd6
parent47ec66bda3e4264f93f142a3903052c4bc6dbec8
parent2eff2de2f81374483df99757046f1d5ee4050155
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel