Merge branch 'master' of https://github.com/tianocore/edk2
authordavid wei <david.wei@intel.com>
Fri, 1 Jul 2016 07:05:48 +0000 (15:05 +0800)
committerdavid wei <david.wei@intel.com>
Fri, 1 Jul 2016 07:05:48 +0000 (15:05 +0800)

Trivial merge