[dragon/f18: 7/7] Merge branch 'master' into f18

[Than Ngo]

commit 15acbeac3c318a39d335b5a24357db141116b2d8
Merge: f2183b7 e42b0b7
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 14:19:14 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	dragon.spec
    	sources

 .gitignore  |    1 +
 dragon.spec |   21 ++++++++++++++++++---
 sources     |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 3ef9bda,bf4df19..64345e1
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,1 +1,6 @@@
 +/dragon-4.9.1.tar.xz
 +/dragon-4.9.2.tar.xz
 +/dragon-4.9.3.tar.xz
 +/dragon-4.9.4.tar.xz
 +/dragon-4.9.5.tar.xz
+ /dragon-4.10.1.tar.xz