[turba/el6/master: 5/5] Merge branch 'master' into el6

[Nick Bebout]

commit 7f6a72dc1c81de7c9cff225be98695bdf68afa42
Merge: 22f61f6 e4bc2a0
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Feb 9 20:26:46 2011 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 sources    |    2 +-
 turba.spec |   12 +++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index b88c5b1,1ad2dbc..9496a56
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- turba-h3-2.2.1.tar.gz
 -turba-h3-2.3.tar.gz
 -/turba-h3-2.3.5.tar.gz
++turba-h3-2.3.5.tar.gz