From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Fri, 8 Oct 2010 10:01:44 +0000 (+0200)
Subject: Merge remote branch 'origin/bug_596_dvdburn_audiotrackorder' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=f755a8ae4676f32dd7f5bc043c9fecbc8c7070d4

Merge remote branch 'origin/bug_596_dvdburn_audiotrackorder' into experimental

Conflicts:
	data/skin_default/icons/Makefile.am
	lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
---

f755a8ae4676f32dd7f5bc043c9fecbc8c7070d4