[gnomad2: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/gnomad2

[Linus Walleij]

commit 20649bb36905ac95b9455c478883c58e2c40f63b
Merge: 1d527fe 92318fd
Author: Linus Walleij <linus.walleij at stericsson.com>
Date:   Mon Apr 25 11:12:33 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gnomad2
    
    Conflicts:
    	gnomad2.spec

 gnomad2.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --cc gnomad2.spec
index ae40bf6,274644d..9518a7c
--- a/gnomad2.spec
+++ b/gnomad2.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:		gnomad2
  Version:    	2.9.4
--Release:	7%{?dist}
++Release:	8%{?dist}
  
  Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
  License:	GPLv2+
@@@ -62,8 -64,9 +62,10 @@@ rm -rf $RPM_BUILD_ROO
  %doc AUTHORS NEWS README COPYING ChangeLog
  
  %changelog
- * Mon Apr 25 2011 Linus Walleij <triad at df.lth.se> 2.9.4-7
++* Mon Apr 25 2011 Linus Walleij <triad at df.lth.se> 2.9.4-8
 +- Drop HAL dependencies and build without HAL
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.4-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Sun Jan 16 2011 Linus Walleij <triad at df.lth.se> 2.9.4-6
  - Require libmtp-hal for now, OK I will fix gnomad2 to use libudev soon
  * Sat Dec 4 2010 Linus Walleij <triad at df.lth.se> 2.9.4-5