hal-info: Branch 'master'

[Martin Pitt]

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

New commits:
commit 55ba3532435be32de9f68b9c3925f6349225c4b5
Author: Achim Frase <achim.frase at googlemail.com>
Date:   Thu Feb 26 11:01:24 2009 +0100

    add Samsung YP S2 music player
    
    Add Samsung YP S2 music player. Reported in
    https://launchpad.net/bugs/331538

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index f4b0ab3..c698a10 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -273,8 +273,8 @@
 	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
 	  </match>	
-	  <!-- Samsung Yepp YP-K3 (Firmware_4.06KR)-->
-	  <match key="@storage.originating_device:usb.product_id" int="0x5080">
+	  <!-- Samsung Yepp YP-K3 (Firmware_4.06KR), YP-S2-->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x5080;0x5095">
 	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>