Merge branch 'mal'
authorKevron Rees <kevron_m_rees@linux.intel.com>
Wed, 12 Sep 2012 23:02:30 +0000 (16:02 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Wed, 12 Sep 2012 23:02:30 +0000 (16:02 -0700)

Trivial merge