[jovie/f18: 8/8] Merge branch 'master' into f18

[Than Ngo]

commit 7987f82d601287c9705f7d5692f9cad01ceed3c6
Merge: c46a36c 898c56c
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 15:10:01 2013 +0100

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

 .gitignore |    1 +
 jovie.spec |   21 ++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index dae930d,733e29c..38b11d5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/jovie-4.8.5.tar.xz
 +/jovie-4.9.1.tar.xz
 +/jovie-4.9.2.tar.xz
 +/jovie-4.9.3.tar.xz
 +/jovie-4.9.4.tar.xz
 +/jovie-4.9.5.tar.xz
+ /jovie-4.10.1.tar.xz