manual merge
authorKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 26 Jul 2013 23:57:11 +0000 (16:57 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 26 Jul 2013 23:57:11 +0000 (16:57 -0700)
commit65f5b7eecf7b3efe78bd1a0d5efd87fd42efd3c2
treed130ef1d544a305297d556ebcfd6ee1155b6a289
parente161b2955419a3a3899a48b6da749d4aff7cc4df
parent1ac7900ea9ffe9c1bb11301637efcc624fc502b5
manual merge
docs/manager.txt
plugins/dbus/automotivemanager.cpp