Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Fri, 19 Dec 2008 00:01:25 +0000 (11:01 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 19 Dec 2008 00:01:25 +0000 (11:01 +1100)
commitcbddddb6cdebcb2edfeb39db2fbea0bfeaee5d88
treea960a4d3b11e3fb2c7c904ebac4dbafbfdd7eb21
parent43f232fcc9b3243781fa3c729f046a737be16720
parent4283ae489b6e227beba196e8a315a9727f03cc07
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel