[sagator/el5/master: 17/17] Merge branch 'master' into el5

[Ján ONDREJ]

commit 303133e011ee00f800ea69048938a214144e0fc1
Merge: 65fdf87 2487477
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Fri Dec 10 13:42:22 2010 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sagator.spec
    	sources

 .gitignore   |    2 ++
 sagator.spec |   15 ++++++++++++---
 sources      |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index f9696dc,58314db..b30f15f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,3 @@@
 +sagator-1.2.0.tar.bz2
+ sagator-1.2.1.tar.bz2
+ /sagator-1.2.2.tar.bz2