[kronolith/el6/master: 6/6] Merge branch 'master' into el6

[Nick Bebout]

commit 33ea2e2a53c8c5e460bf18ded6eb657dacf6e18e
Merge: 8d8ddc2 8b5e821
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Feb 9 20:25:54 2011 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore     |    2 +-
 kronolith.spec |   13 +++++++++++--
 sources        |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 5a13b80,4ef58ab..c776193
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- kronolith-h3-2.2.tar.gz
 -kronolith-h3-2.3.4.tar.gz
 -/kronolith-h3-2.3.5.tar.gz
++kronolith-h3-2.3.5.tar.gz