Merge branch 'master' of github.com:otcshare/automotive-message-broker
authorKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 28 Jun 2013 18:03:56 +0000 (11:03 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 28 Jun 2013 18:03:56 +0000 (11:03 -0700)

Trivial merge