From: acid-burn <acid-burn@opendreambox.org>
Date: Thu, 18 Mar 2010 10:24:53 +0000 (+0100)
Subject: Merge commit 'origin/bug_478_Listbox_ScrollbarMode' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=aa979f0bc35f6160453b966942a0a86602d8c071

Merge commit 'origin/bug_478_Listbox_ScrollbarMode' into experimental

Conflicts:
	lib/python/Components/Converter/TemplatedMultiContent.py
	lib/python/Components/Renderer/Listbox.py
---

aa979f0bc35f6160453b966942a0a86602d8c071