Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Sun, 9 Nov 2008 22:58:42 +0000 (09:58 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 9 Nov 2008 22:58:42 +0000 (09:58 +1100)
commit28f044de479dcb8a442dc2f3f2546cea614caf39
tree2438c545053a6b279d90fb382388092022ccdfb9
parentb5696a76d65c03e114384b8956385d75351df5dc
parentd64caaf593201ca02ab9eac86e98c5adab3faf72
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel