manual cherry pick merge
authorKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 18 Jul 2013 18:19:36 +0000 (11:19 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 18 Jul 2013 18:33:26 +0000 (11:33 -0700)
commit1ff9e98a9b25058aa4fe8c59d33080b18817713f
treeff917c277d95dc54a9c923dd76daba7585269a0e
parent6491f8e11aff4df6eb4d0c7d29d324ae6653c39e
manual cherry pick merge
plugins/dbus/runningstatus.h
plugins/wheel/wheelplugin.cpp