From: acid-burn <acid-burn@opendreambox.org>
Date: Tue, 5 Oct 2010 07:33:32 +0000 (+0200)
Subject: Merge commit 'origin/bug_478_Listbox_ScrollbarMode'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=db1d27d8b635de5bf0096a4853b45f42090050ad

Merge commit 'origin/bug_478_Listbox_ScrollbarMode'

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

db1d27d8b635de5bf0096a4853b45f42090050ad