Whitespace changes to sync up with master.
Fix regression in gammu-monitor.
Merge branch 'dev'