merging trunk

packages/audio/alsa/config/asound.conf

@@ -0,0 +1,69 @@
+pcm.!default {
+type plug
+slave {
+pcm "both"
+}
+}
+
+pcm.both {
+type route
+slave {
+pcm multi
+channels 6
+}
+ttable.0.0 1.0
+ttable.1.1 1.0
+ttable.0.2 1.0
+ttable.1.3 1.0
+ttable.0.4 1.0
+ttable.1.5 1.0
+}
+
+pcm.multi {
+type multi
+slaves.a {
+pcm "tv"
+channels 2
+}
+slaves.b {
+pcm "receiver"
+channels 2
+}
+slaves.c {
+pcm "analog"
+channels 2
+}
+bindings.0.slave a
+bindings.0.channel 0
+bindings.1.slave a
+bindings.1.channel 1
+bindings.2.slave b
+bindings.2.channel 0
+bindings.3.slave b
+bindings.3.channel 1
+bindings.4.slave c
+bindings.4.channel 0
+bindings.5.slave c
+bindings.5.channel 1
+}
+
+pcm.tv {
+type hw
+card 0
+device 3
+channels 2
+}
+
+pcm.receiver {
+type hw
+card 0
+device 1
+channels 2
+}
+
+pcm.analog {
+type hw
+card 0
+device 0
+channels 2
+}

packages/mediacenter/xbmc-theme-Confluence/url

@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-theme-Confluence-29914.tar.bz2
+http://sources.openelec.tv/svn/xbmc-theme-Confluence-29890.tar.bz2

packages/mediacenter/xbmc-theme-PM3-HD/url

@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29914.tar.bz2
+http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29890.tar.bz2

packages/mediacenter/xbmc/url

@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-29914.tar.bz2
+http://sources.openelec.tv/svn/xbmc-29890.tar.bz2