Merge branch 'vuplus-1.6' of code.vuplus.com:/opt/repository/openembedded into kernel31
authorschon <schon@dev03-server>
Fri, 25 Nov 2011 09:40:02 +0000 (18:40 +0900)
committerschon <schon@dev03-server>
Fri, 25 Nov 2011 09:40:02 +0000 (18:40 +0900)
commit568919442c1e0b72b5b9bcf37e1bb2ef9aa9981b
tree876635945de6afc7f165b0941d5ca5dfa4b40102
parente3779edf6b2e0efa2af78c0fb0fa02ffb9f2e950
parent8c5d9923a34530d0360cef74c4184f2f4275a9c9
Merge branch 'vuplus-1.6' of code.vuplus.com:/opt/repository/openembedded into kernel31

Conflicts:
conf/machine/vuultimo.conf
recipes/vuplus/vuplus-dvb-modules.bb
conf/machine/vuultimo.conf
recipes/tasks/task-vuplus-enigma2.bb