[spectrum/el6/master: 17/17] Merge branch 'f13' into el6

[Matej Cepl]

commit 4ffad4764cb105f78fefc6fd34c117bd665fcbf7
Merge: 246149f f775d36
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Aug 12 19:28:25 2010 +0200

    Merge branch 'f13' into el6
    
    Conflicts:
    
    	.gitignore
    	sources
    	spectrum.spec

 .gitignore                 |    2 +-
 sources                    |    2 +-
 spectrum-1.4.0-cmake.patch |  112 ++++++++++++++++++++++++++++++++++++++++++++
 spectrum.spec              |    7 ++-
 4 files changed, 119 insertions(+), 4 deletions(-)
---