Merge commit 'dm/opendreambox-1.6' into test branch
authorschon <schon@dev03-server>
Wed, 25 May 2011 07:37:16 +0000 (16:37 +0900)
committerschon <schon@dev03-server>
Wed, 25 May 2011 07:37:16 +0000 (16:37 +0900)
commit77bab367058da3ad594f840122f04f7507be603d
tree355f16a609f7ffe65fba514b2299d597b407053f
parentcf27571e770c774cca6388384fb290cae8743a7e
parent3c12e3893d0623c99f353d814146709844baa5a9
Merge commit 'dm/opendreambox-1.6' into test branch

Conflicts:
recipes/enigma2/enigma2-drivers-meta_1.0.bb