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

[Ray Strode]

commit d184bcde10e4ee3d55452a4b519462c6ea3c9e68
Merge: ce5edd5 d769773
Author: Ray Strode <rstrode at redhat.com>
Date:   Mon Mar 12 13:14:49 2012 -0400

    Merge branch 'master' into f17

 plymouth.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---