Merge master into v3-6-test again.
authorKarolin Seeger <kseeger@samba.org>
Tue, 30 Nov 2010 10:50:39 +0000 (11:50 +0100)
committerKarolin Seeger <kseeger@samba.org>
Tue, 30 Nov 2010 10:52:56 +0000 (11:52 +0100)
commite6c93277d32a2bd4fd302da1a8aad2ace63e3839
tree144416342fd691aa1bd6aeebe582f2c5de846bd5
parent10d1cd7af7962a2ce012f426947e9b0538e9f653
parent71386a36a9782c43c675cc8580d849a30be0ab2f
Merge master into v3-6-test again.

Karolin