Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 24 Feb 2009 00:40:28 +0000 (11:40 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 24 Feb 2009 00:40:28 +0000 (11:40 +1100)
commit3a1b4c00eb96634229fb730e9b38e8df5180756a
tree2642c03cc4f0f8e52d4718b93facfe411a52d9ab
parentb9860043dc092df25d4a39074e106d7367ebbe8f
parentfaa1100d229aef56da5d48f5c19ec901e520f8ef
Merge branch 'master' of ssh://git.samba.org/data/git/samba