am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a...
am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '9666bbdf' into kraken
* commit '9666bbdf':
bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.