hal: Branch 'origin' - 3 commits

[David Zeuthen]

 configure.in                                           |    2 +-
 fdi/information/10freedesktop/10-usb-music-players.fdi |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree 5964f3f626d746fa832b65437423b75c315f29c5 (from 828c748d4c920a40e1a591d8a9061bfa15d5cb9b)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 15 12:16:53 2007 +0100

    removed folder information fro YP-U1
    
    Removed portable_audio_player.audio_folders property for the Samsung YP-U1
    to fix fd.o bug #10297

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 338702a..6d9a13c 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -204,7 +204,6 @@
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
           </match>  
           <!-- Samsung YP-Z5 -->
           <match key="@storage.originating_device:usb.product_id" int="0x5041">
diff-tree 828c748d4c920a40e1a591d8a9061bfa15d5cb9b (from parents)
Merge: f49e80ca43d6230bff7c6b103758144285d56eb6 98b34973933fc6db1735ae94053ed369826226f7
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Mar 13 17:43:48 2007 -0400

    Merge branch 'master' of ssh://david@git.freedesktop.org/git/hal-info

diff-tree f49e80ca43d6230bff7c6b103758144285d56eb6 (from e3699bad5e8da3a986a585c7ff448fdfc90403b9)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Mar 13 17:43:34 2007 -0400

    update version to 20070313

diff --git a/configure.in b/configure.in
index a2bc052..d57f37a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_PREREQ(2.57)
 
-AC_INIT(hal-info, 20070304, david at fubar.dk)
+AC_INIT(hal-info, 20070313, david at fubar.dk)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)