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

[gwei3]

commit 3a9a7f50955c2f924dc5c98b3748a57dcdf8e47f
Merge: 835d9c8 a0bd705
Author: Gang Wei <gang.wei at intel.com>
Date:   Tue Apr 2 06:56:39 2013 -0400

    Merge branch 'master' into f18

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