hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 4fd982c18ad1b73fc8745524c335da68d8adc980
Author: Adam Williamson <awilliamson at mandriva.com>
Date:   Tue Mar 4 16:38:51 2008 +0100

    support Nokia 6300 as a music device
    
    Added a Nokia 6300 to list of USB mp3 music players.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index c968d62..1c308ef 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -92,6 +92,15 @@
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
             <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
           </match>
+  	  <!-- Nokia 6300 -->
+          <match key="@storage.originating_device:usb.product_id" int="0x4fa">
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">music/</append>
+          </match>
         </match>
 
         <!-- MPIO HD300 Player -->