am 60be8485: am 8785c064: Merge change Ie5df08ef into eclair-mr2

Merge commit '60be84855435c2f354833a98e1bf6154cc45078c'

* commit '60be84855435c2f354833a98e1bf6154cc45078c':
  Let PLUS occur once anywhere in dial-str network portion.