[spectrum/f15: 3/3] Merge branch 'master' into f15

[Matej Cepl]

commit c3cb5bdd9f412b72fcc7a0cb342947bc2b42d6a4
Merge: c3e17d9 d6d8a56
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Nov 29 01:56:20 2011 +0100

    Merge branch 'master' into f15

 spectrum-fix-sysvinit-priority.patch |   11 +++++++++++
 spectrum.spec                        |   12 +++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---