Merge commit 'origin/v3-5-test' into v3-5-test
commit69d345ca71d127467fda768dc364a85333811397
authorKarolin Seeger <kseeger@samba.org>
Wed, 30 Sep 2009 12:36:06 +0000 (30 14:36 +0200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 30 Sep 2009 12:36:41 +0000 (30 14:36 +0200)
tree38832cb25cc0c3714411b069c26318f34e485a1f
parent0d241b0b312503ea5871bd5068c3bf0c657938ac
parent56f58860020151cdb720b865b9338d86320f73a6
Merge commit 'origin/v3-5-test' into v3-5-test

Re-sync with current master branch as requested on samba-technical.