Merge branch 'master' of https://github.com/malcom2073/automotive-message-broker...
authorKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 11 Sep 2012 16:18:46 +0000 (09:18 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 11 Sep 2012 16:18:46 +0000 (09:18 -0700)

Trivial merge