hal: Branch 'master'

[Jeff Mitchell]

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

New commits:
commit e9f99847dac2ab99fa2ee2ff30ceb87cc3ef4d3a
Author: Jeff Mitchell <kde-dev at emailgoeshere.com>
Date:   Fri Jan 11 11:51:41 2008 -0500

    Screwed up whitespacing somehow with my last commit...fix it.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 01a4c76..67539df 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -119,7 +119,7 @@
           <match key="@storage.originating_device:usb.product_id" int="0x5210">
             <merge key="portable_audio_player.type" type="string">generic</merge>
             <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <addset key="portable_audio_player.access_method.protocols" type="strlist">karma</addset>                      
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">karma</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>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>