Merge commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42' into eclair-mr2 * commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42': Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Merge commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42' into eclair-mr2 * commit '0d72f7e9fc0d6f774eda5758d111bec5608bcf42': Fix a race condition that could result in the screen being forced off indefinitely after a phone call.