[spectrum/f13/master: 6/6] Merge branch 'master' into f13

[Matej Cepl]

commit f430ffa5f4d0a103fed9f8bdda6dafe906b5a415
Merge: 377fb5a b77ecfa
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Jan 3 17:56:01 2011 +0100

    Merge branch 'master' into f13

 .gitignore                 |    2 +
 sources                    |    2 +-
 spectrum-failed-test.patch |   88 --------------------------------------------
 spectrum.spec              |   21 ++++++++--
 4 files changed, 19 insertions(+), 94 deletions(-)
---