Merge branch 'master' of github.com:otcshare/automotive-message-broker
authorKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 15 Mar 2013 21:23:02 +0000 (14:23 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Fri, 15 Mar 2013 21:23:02 +0000 (14:23 -0700)

Trivial merge