hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d6e83321d52163289e6e4c0e781de67908031f1
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Nov 12 21:15:06 2007 +0100

    added Cowon iAudio 6 to USB music players
    
    Added a Cowon iAudio 6 to the USB music players as reported in Launchpad
    by user Eythian (Robin Sheat <robin at kallisti.net.nz>) and to fd.o bug
    12978.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9ad1a7d..611881b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -436,7 +436,7 @@
 	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
 	  </match>
           <!-- iAudio F2 -->
-          <match key="@storage.originating_device:usb.product_id" int="0x730">
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x710;0x730">
             <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">application/ogg</append>