hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 88c996ed64fcc0c8bf13ab3382d8eeecb442b8cf
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Nov 12 21:04:16 2007 +0100

    added a Sansa e140 to the list of music players
    
    Added a Sansa e140 to the list of music players. Intial report
    from Ohad Lutzky on Launchpad (reported in fd.o bug 12972).

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9c2ef94..9ad1a7d 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -316,8 +316,8 @@
 
 	<!-- SanDisk -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x781">
-	  <!-- Sansa e130 -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x7301">
+	  <!-- Sansa e130, e140 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x7301;0x7302">
 	    <merge key="portable_audio_player.type" type="string">generic</merge>
 	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>