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


Trivial merge