Merge branch 'bug_249_current_skin_fallback'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:47:59 +0000 (06:47 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:47:59 +0000 (06:47 +0100)
commit9c998a40679f9b630ccf8cc6fda7384ce94c30e5
tree6e31e148f6153232293b339ddf2e0c6328bf1e22
parentd6ad23c5be62bc24cc08a5c8db91f64ae2d8cf3b
parentd64e82b37efdf77b557234809d0c81857818bfac
Merge branch 'bug_249_current_skin_fallback'

Conflicts:
lib/python/Components/FileList.py
lib/python/Components/FileList.py