Merge change Ie7e8a7ef into eclair

* changes:
  Don't auto-connect to OPP after pairing