Merge branch 'master' of ssh://mpr3.jf.intel.com:29418/intel/image-configurations
authorTracy Graydon <tracy.graydon@intel.com>
Wed, 29 Feb 2012 01:55:17 +0000 (17:55 -0800)
committerTracy Graydon <tracy.graydon@intel.com>
Wed, 29 Feb 2012 01:55:17 +0000 (17:55 -0800)

Trivial merge