fixed merge 32/2532/1
authorKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 27 Nov 2012 20:59:13 +0000 (12:59 -0800)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 27 Nov 2012 20:59:13 +0000 (12:59 -0800)

Trivial merge