Merge remote-tracking branch 'oe21/master' into vuplus-3.0
authorhschang <chang@dev3>
Wed, 24 Dec 2014 09:41:23 +0000 (18:41 +0900)
committerhschang <chang@dev3>
Wed, 24 Dec 2014 09:42:04 +0000 (18:42 +0900)
commit2ecbc9b23df48ce352089877a5b66d9671e7ad2e
tree40b2ab0b21f76fdc2ce1164b7ec835cdb5923597
parent68972ee05141a5389d11e2f8fe9c5291a50ab66c
parent8875b4e95bc1f15c458d33664fe929e297de85a1
Merge remote-tracking branch 'oe21/master' into vuplus-3.0

Conflicts:
meta-openvuplus/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb