Merge commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe' into kraken * commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe': cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo
Merge commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe' into kraken * commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe': cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo