--- 10-usb-music-players.fdi.bak	2006-10-05 00:06:28.000000000 -0700
+++ 10-usb-music-players.fdi	2006-10-10 12:55:39.000000000 -0700
@@ -28,6 +28,7 @@
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
           <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
           <merge key="storage.drive_type" type="string">memory_stick</merge>
+	  <append key="portable_audio_player.audio_folders" type="strlist">PSP/MUSIC/</append>
         </match>
       </match>
 
@@ -589,6 +590,7 @@
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">mp3/</append>
 	  </match>
 	</match>
 
@@ -718,7 +720,20 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
           </match>
-        </match>
+          <!-- V360 mass storage mode -->
+	  <match key="@storage.physical_device:usb.product_id" int="0x4810">
+            <merge key="storage.model" type="string">V360</merge>
+            <merge key="storage.vendor" type="string">Motorola</merge>
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
+	    <merge key="info.category" type="string">portable_audio_player</merge>
+	    <merge key="portable_audio_player.type" type="string">generic</merge>
+	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
+	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">mobile/audio/</append>
+	  </match>
+	</match>
 
 	<!-- iRiver -->
 	<match key="@storage.physical_device:usb.vendor_id" int="0x4102">