am 5f81f82d: am 373f2c68: am eb6f9c08: Merge change I0ad3fc43 into eclair

Merge commit '5f81f82ddf8c14b86ce6e5721638d2a09f0b39ae'

* commit '5f81f82ddf8c14b86ce6e5721638d2a09f0b39ae':
  Avoid IAE by only dismissing dialog when still attached.