some fix for android 2.1 web auth problem
Merge branch 'master' into ice-cream-sandwich