Merge branch 'mine48' submit/trunk/20121003.174145
authorGraydon, Tracy <tracy.graydon@intel.com>
Wed, 3 Oct 2012 17:40:23 +0000 (10:40 -0700)
committerGraydon, Tracy <tracy.graydon@intel.com>
Wed, 3 Oct 2012 17:40:23 +0000 (10:40 -0700)

Trivial merge