Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-mr2 * commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11': Fix issue #2186709: Can't unlock the device for a while
Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-mr2 * commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11': Fix issue #2186709: Can't unlock the device for a while