manual merge, patch only relevant for 4.1

This commit is contained in:
tomas@poseidon.ndb.mysql.com 2006-06-30 16:29:17 +02:00
commit c8b65bb357

Diff content is not available