manual merge
authorKevron Rees <kevron_m_rees@linux.intel.com>
Wed, 23 Jan 2013 18:46:28 +0000 (10:46 -0800)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Wed, 23 Jan 2013 18:46:28 +0000 (10:46 -0800)

Trivial merge