Merge change Iba6fd660 into eclair

* changes:
  Set BondState to Bonding only if it not Bonded already.