[cantor/f17: 13/13] Merge branch 'master' into f17

[Than Ngo]

commit 99e98dc3660f56e53c615be68a9a8245267aa1de
Merge: 33d84ab a9b41a9
Author: Than Ngo <than at redhat.com>
Date:   Thu Mar 7 14:28:49 2013 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	cantor.spec
    	sources

 .gitignore  |    1 +
 cantor.spec |   28 ++++++++++++++++++++++++----
 sources     |    2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index f7ae856,77b163d..86aa78b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/cantor-4.8.5.tar.xz
 +/cantor-4.9.1.tar.xz
 +/cantor-4.9.2.tar.xz
 +/cantor-4.9.3.tar.xz
 +/cantor-4.9.4.tar.xz
 +/cantor-4.9.5.tar.xz
+ /cantor-4.10.1.tar.xz