Merge branch 'vuplus-1.6k' of code.vuplus.com:/opt/repository/openembedded into vuplu...
authorkos <kos@dev3>
Fri, 24 Aug 2012 09:06:48 +0000 (18:06 +0900)
committerkos <kos@dev3>
Fri, 24 Aug 2012 09:06:48 +0000 (18:06 +0900)
commit3ab75d48144a49663e3fa9eeecfd783ae6d5d8f6
tree6b6a3dbe42cb98bcf9264acba8f62f34365199cd
parent74375df4b54eb41f1622816479f53c6a847ab1e9
parentf2230bf4efc709c2ae99febfd8937ffff219616f
Merge branch 'vuplus-1.6k' of code.vuplus.com:/opt/repository/openembedded into vuplus-1.6k

Conflicts:
recipes/enigma2/enigma2.bb
recipes/enigma2/enigma2.bb
recipes/tasks/task-vuplus-enigma2.bb