Merge "Fix soft-sensor-manager service build errors"
authorPatrick Lankswert <patrick.lankswert@intel.com>
Sat, 27 Dec 2014 22:39:49 +0000 (22:39 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Sat, 27 Dec 2014 22:39:49 +0000 (22:39 +0000)

Trivial merge