Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 24 Apr 2009 07:17:08 +0000 (09:17 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 24 Apr 2009 07:17:08 +0000 (09:17 +0200)
commit2ee9ee2c17ce435ce45a773f19302a7b474554c2
tree2ea91c2d36664f02e001575be0591660190d86ed
parentb82a204b9b2c28707ab7866a511ea4f5912826ac
parentaf6316d1500cfcedd5fd59ed0ddbba9aec9c3756
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel