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

[Matej Cepl]

commit faa09b5712fddb7955c3c5855e12dff2be163038
Merge: a24ea65 b77ecfa
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Jan 3 17:54:07 2011 +0100

    Merge branch 'master' into el6

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