Merge change Id886fb28 into eclair

* changes:
  Fix deadlock in WindowManagerService.reenableKeyguard()