Merge commit 'origin/bug_478_Listbox_ScrollbarMode' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Thu, 18 Mar 2010 10:24:53 +0000 (11:24 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 18 Mar 2010 10:24:53 +0000 (11:24 +0100)
commitaa979f0bc35f6160453b966942a0a86602d8c071
treed359865d20fd81c907a9b7b7f46f58976faba1f9
parentfd6a97a1e97091b733add33b46ba746a467b21fa
parentca5b57073d8ef83110e6956b71134f3c1a1589a6
Merge commit 'origin/bug_478_Listbox_ScrollbarMode' into experimental

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