[fedora-easy-karma/el6: 2/2] Merge branch 'master' into el6

[Till Maas]

commit 1b5101118162d9af34d7a8340b7b4c11b57fa195
Merge: bc8bb5f ebd280c
Author: Till Maas <opensource at till.name>
Date:   Tue Aug 23 18:12:36 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	fedora-easy-karma.spec

 .gitignore             |    1 +
 fedora-easy-karma.spec |   10 +++++++---
 sources                |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc fedora-easy-karma.spec
index fb0a7d3,385fd56..e3910ce
--- a/fedora-easy-karma.spec
+++ b/fedora-easy-karma.spec
@@@ -13,10 -13,7 +13,10 @@@ URL:            https://fedoraproject.o
  # Updated using:
  # http://fedorapeople.org/gitweb?p=walters/public_git/fedpkg-make-pull.git;a=summary
  # Commandline: fedpkg-vcs -f pull-retarget
- Source0:        fedora-easy-karma-0gitadba3055.tar.bz2
+ Source0:        fedora-easy-karma-0gitb0706146.tar.bz2
 +# 2010-07-02: set the default product to EL- on EPEL. This might be autodected
 +# some time in the far far aways future. Not suitable for upstreaming.
 +Patch0:         fedora-easy-karma-0-default-product.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch:      noarch
  
@@@ -32,8 -29,7 +32,8 @@@ updates that you have currently install
  
  
  %prep
- %setup -q -n fedora-easy-karma-0gitadba3055
+ %setup -q -n fedora-easy-karma-0gitb0706146
 +%patch0 -p1 -b .default-product
  
  
  %build