Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0
authorhschang <chang@dev3>
Wed, 23 Jul 2014 04:18:42 +0000 (13:18 +0900)
committerhschang <chang@dev3>
Wed, 23 Jul 2014 04:18:42 +0000 (13:18 +0900)
commit38875c9b5c043e066ed208f4d2ac79c1bd5b4c83
tree92de2aebe58774d025f4dcb73efea3e98aa2ff01
parentd9b7586da5293284664231a1752b2ce83279d9b3
parenta2c7a260efd3947171e3110efb2c6c31bb79fec2
Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0

Conflicts:
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
meta-openvuplus/recipes-vuplus/opera-hbbtv/opera-hbbtv_0.2.bb