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

[Matej Cepl]

commit 585d084b68857fa5b038d9e985c1012d18af2036
Merge: faa09b5 46e7587
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Jan 24 16:37:42 2011 +0100

    Merge branch 'master' into el6

 .gitignore           |    1 +
 sources              |    2 +-
 spectrum-cmake.patch |   24 ++++++++++++------------
 spectrum.spec        |    8 ++++++--
 4 files changed, 20 insertions(+), 15 deletions(-)
---