Merge branch 'master' of github.com:otcshare/automotive-message-broker
authorKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 14 Feb 2013 19:15:58 +0000 (11:15 -0800)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Thu, 14 Feb 2013 19:15:58 +0000 (11:15 -0800)

Trivial merge