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

[Than Ngo]

commit cd35e0f5a087c03cfed8d7967862cfc5f760a8ec
Merge: 980be0f 4ac6d98
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 15:19:30 2013 +0100

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

 .gitignore |    1 +
 juk.spec   |   22 ++++++++++++++++++----
 sources    |    2 +-
 3 files changed, 20 insertions(+), 5 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
diff --cc juk.spec
index 35d39d1,06ba912..e0b305d
--- a/juk.spec
+++ b/juk.spec
@@@ -1,4 -1,4 +1,3 @@@
--
  %if 0%{?fedora}
  %global tunepimp 1
  %endif