Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --combined config/rootfiles/packages/mpfire
index 63f6ff37a259f4e496b4cb46b8437f99e2929b00,fd43d9d57b25007a471aeae54cd06f3c5c8c3258..84ae5992663fb68c0dabc150f21d550c75bf064d
--- 1/config/rootfiles/packages/mpfire
--- 2/config/rootfiles/packages/mpfire
+++ b/config/rootfiles/packages/mpfire
@@@ -1,29 -1,25 +1,29 @@@
 +srv/web/ipfire/cgi-bin/mpfire.cgi
 +srv/web/ipfire/html/images/mpfire
  usr/lib/perl5/5.8.8/Class/Accessor
  usr/lib/perl5/5.8.8/Class/Accessor.pm
  usr/lib/perl5/5.8.8/Class/Accessor/Fast.pm
  usr/lib/perl5/5.8.8/Class/Accessor/Faster.pm
  usr/lib/perl5/5.8.8/Readonly.pm
  usr/lib/perl5/site_perl/5.8.8/Audio
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Collection.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Directory.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Playlist.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Song.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Stats.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Status.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Time.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Playlist.pm
 -#usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Test.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Collection.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Directory.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Playlist.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Item/Song.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Stats.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Status.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Common/Time.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Playlist.pm
 +usr/lib/perl5/site_perl/5.8.8/Audio/MPD/Test.pm
 +usr/local/bin/mpfirectrl
  var/ipfire/backup/addons/includes/mpfire
 +var/ipfire/menu.d/EX-mpfire.menu
  var/ipfire/mpfire
  var/ipfire/mpfire/bin
  var/ipfire/mpfire/bin/mpfire.pl
@@@ -33,3 -29,7 +33,7 @@@ var/ipfire/mpfire/mpd.con
  var/ipfire/mpfire/playlist.m3u
  var/ipfire/mpfire/settings
  var/ipfire/mpfire/webradio
+ usr/local/bin/mpfirectrl
+ srv/web/ipfire/cgi-bin/mpfire.cgi
+ srv/web/ipfire/html/images/mpfire
+ var/ipfire/menu.d/EX-mpfire.menu