Merge branch 'master' of ssh://mpr3.jf.intel.com:29418/pkgs/i/image-configurations
authorTracy Graydon <tracy.graydon@intel.com>
Tue, 28 Feb 2012 19:11:50 +0000 (11:11 -0800)
committerTracy Graydon <tracy.graydon@intel.com>
Tue, 28 Feb 2012 19:11:50 +0000 (11:11 -0800)

Trivial merge