Merge commit 'origin/bug_478_Listbox_ScrollbarMode'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 07:33:32 +0000 (09:33 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 07:33:32 +0000 (09:33 +0200)
commitdb1d27d8b635de5bf0096a4853b45f42090050ad
treeb2dceb5506ae6d27ab9d3e3a0995c26eb1b87b62
parentceda5c95efab67c8116ba9ed4a51d4488c46d741
parentca5b57073d8ef83110e6956b71134f3c1a1589a6
Merge commit 'origin/bug_478_Listbox_ScrollbarMode'

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