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

Merge branch 'obi/master' into experimental

Conflicts:
	main/Makefile.am
---

31a7ee4d64f718ac076f3d2037427877435c4101