Merge branch 'master' of github.com:otcshare/automotive-message-broker 0.2.1
authorKevron Rees <kevron_m_rees@linux.intel.com>
Mon, 9 Jul 2012 23:49:00 +0000 (16:49 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Mon, 9 Jul 2012 23:49:00 +0000 (16:49 -0700)

Trivial merge