[Merge] lp:~binli/ubuntu/trusty/modemmanager/lp1441095 into lp:ubuntu/trusty/modemmanager

[Bin Li]

Again, with Shi-Yuan's feedback, we should follow the previous code.

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/modemmanager/trusty/revision/40

I just recommit it with applying all the patches with 'quilt push -a', and ignore all the .timestamp files.

Thanks a lot!
-- 
https://code.launchpad.net/~binli/ubuntu/trusty/modemmanager/lp1441095/+merge/272054
Your team Ubuntu branches is requested to review the proposed merge of lp:~binli/ubuntu/trusty/modemmanager/lp1441095 into lp:ubuntu/trusty/modemmanager.