Merge commit 'origin/v3-5-test' into v3-5-test
authorKarolin Seeger <kseeger@samba.org>
Wed, 30 Sep 2009 12:36:06 +0000 (14:36 +0200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 30 Sep 2009 12:36:41 +0000 (14:36 +0200)
Re-sync with current master branch as requested on samba-technical.


Trivial merge