[tboot/f17: 2/2] Merge branch 'master' into f17

[gwei3]

commit fd2d25221742fdd7b96f44588b5d76979153d3ad
Merge: 835d9c8 a0bd705
Author: Gang Wei <gang.wei at intel.com>
Date:   Tue Apr 2 07:00:53 2013 -0400

    Merge branch 'master' into f17

 tboot-1.7.3-grub-fix.patch |   33 +++++++++++++++++++++++++++++++++
 tboot.spec                 |    7 ++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---