Android market 2.0

no clue, how to exclude the fix from yesterday...

Anyway, here's a (hopeful) fix for bug 3640075.

Please have a look, I suggest we release a new version then as the upgrade process is affected.