[libnjb: 2/2] Merge in new device support

[Linus Walleij]

commit 00d63239423e20adbd5e6392f220fcd6b1ef6d4f
Merge: 78c15fa c0f44b5
Author: Linus Walleij <linus.walleij at stericsson.com>
Date:   Wed Jun 15 20:45:39 2011 +0200

    Merge in new device support

 libnjb.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --cc libnjb.spec
index cb19205,4b6c097..8b01730
--- a/libnjb.spec
+++ b/libnjb.spec
@@@ -3,7 -3,7 +3,7 @@@
  
  Name:		libnjb
  Version:	2.2.6
--Release:	9%{?dist}
++Release:	10%{?dist}
  Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
  URL:		http://libnjb.sourceforge.net/
  
@@@ -104,8 -104,9 +104,10 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Wed Jun 15 2011 Linus Walleij <triad at df.lth.se> 2.2.6-9
++* Wed Jun 15 2011 Linus Walleij <triad at df.lth.se> 2.2.6-10
 +- Tag libnjb devices with a specific ID for autodetection
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.6-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Sat Dec 4 2010 Linus Walleij <triad at df.lth.se> 2.2.6-8
  - Fix up ages old udev rules to match latest standards.
  * Sat Dec 4 2010 Linus Walleij <triad at df.lth.se> 2.2.6-7