Re-apply fix from r1209 that was clobbered in r6925.
Re-apply fix from r1209 that was clobbered in r6925.

Review URL: http://codereview.chromium.org/20426


git-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@9890 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser