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

[Matej Cepl]

commit 9436013aca6da4f7f3a7aaeaec2baf94164d17c7
Merge: d8974ca d342366
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Nov 16 11:36:45 2010 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	spectrum.spec

 .gitignore                 |    2 +
 sources                    |    2 +-
 spectrum-cmake.patch       |   26 ++++++------
 spectrum-failed-test.patch |   88 ++++++++++++++++++++++++++++++++++++++++++++
 spectrum.spec              |   17 ++++++--
 5 files changed, 116 insertions(+), 19 deletions(-)
---