Merge branch 'master' of github.com:otcshare/automotive-message-broker
authorKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 12 Jul 2013 22:00:20 +0000 (15:00 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 12 Jul 2013 22:00:20 +0000 (15:00 -0700)

Trivial merge