Merge branch 'upstream' into release 15/1915/1
authorKevron Rees <kevron_m_rees@linux.intel.com>
Mon, 1 Oct 2012 22:54:31 +0000 (15:54 -0700)
committerKevron Rees <kevron_m_rees@linux.intel.com>
Mon, 1 Oct 2012 22:54:31 +0000 (15:54 -0700)

Trivial merge