Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/ccf-resource
authorErich Keane <erich.keane@intel.com>
Tue, 5 Aug 2014 21:51:56 +0000 (14:51 -0700)
committerErich Keane <erich.keane@intel.com>
Tue, 5 Aug 2014 21:51:56 +0000 (14:51 -0700)

Trivial merge