bdb59f66b9
Merge commit '295eb97c7623105d6199fa91e58394e474a0abb1' into kraken * commit '295eb97c7623105d6199fa91e58394e474a0abb1': cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo