am eb6f9c08: Merge change I0ad3fc43 into eclair

Merge commit 'eb6f9c0824ed739ad4fbfeef19ac1b54553a0914' into eclair-mr2

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