Merge branch 'par_build_fix'
authorKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 21 Aug 2012 23:34:20 +0000 (16:34 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Tue, 21 Aug 2012 23:34:20 +0000 (16:34 -0700)

Trivial merge