From: Andreas Oberritter <obi@opendreambox.org>
Date: Mon, 20 Dec 2010 11:18:19 +0000 (+0100)
Subject: Merge branch 'master' into obi/master
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=16c07b98245e94a162685803acd4ba4b5d4298a3;hp=16c07b98245e94a162685803acd4ba4b5d4298a3

Merge branch 'master' into obi/master

Conflicts:
	main/Makefile.am
---