Merge remote branch 'origin/v3-6-test' into v3-6-stable
commit2bd5a6f6b11b980dd6d55ade1862f6f95cfab708
authorKarolin Seeger <kseeger@samba.org>
Mon, 11 Apr 2011 05:44:15 +0000 (11 07:44 +0200)
committerKarolin Seeger <kseeger@samba.org>
Mon, 11 Apr 2011 05:45:33 +0000 (11 07:45 +0200)
treeb4c7d36afc228eff711a4af06b246067884f4fa9
parent4356488cddc1b7178c44dac1687360a69719eeea
parentd5e4d87767cfc9e8f92fd99222c1e3af3de59d75
Merge remote branch 'origin/v3-6-test' into v3-6-stable

Karolin