[spectrum/el5/master: 2/2] Merge branch 'master' into el5

[Matej Cepl]

commit a43226d0ea435ce6001ca6f596f6fdef02c8321e
Merge: 03a74e9 87ff77e
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Aug 26 14:48:11 2010 +0200

    Merge branch 'master' into el5

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 spectrum-1.4.0-cmake.patch => spectrum-cmake.patch |    0
 spectrum.spec                                      |    6 +++---
 4 files changed, 5 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index aa2fa41,bf68f2c..fda3446
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -spectrum-0.3.1.tar.gz
  spectrum-1.4.0.tar.gz
+ /spectrum-1.4.1.tar.gz