[juk/f17: 7/7] Merge branch 'master' into f17

[Than Ngo]

commit 93fd0918952878579ce9cb539d631a16ef6193d8
Merge: 980be0f 4ac6d98
Author: Than Ngo <than at redhat.com>
Date:   Thu Mar 7 15:19:34 2013 +0100

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

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