Merge branch 'mr'
authorKevron Rees <kevron_m_rees@linux.intel.com>
Mon, 4 Apr 2011 18:08:35 +0000 (11:08 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Mon, 4 Apr 2011 18:08:35 +0000 (11:08 -0700)

Trivial merge