Merge change I4261c58d into eclair-mr2

* changes:
  Check if another Activity wants to intercept an xml mime type.