Merge branch 'kernel31' of code.vuplus.com:/opt/repository/openembedded into kernel31
authorschon <schon@dev03-server>
Tue, 27 Dec 2011 06:16:40 +0000 (15:16 +0900)
committerschon <schon@dev03-server>
Tue, 27 Dec 2011 06:16:40 +0000 (15:16 +0900)
commit3c19ac3162817b326bb08a73f07b658052e3a766
tree9d6626f8f4b565bc360fd5442a38ae2ee1a6794a
parent51d590706e232139555cba74e06f0ce60769d04d
parentf3f6f4f567650272db40a13e7a192847471dc90b
Merge branch 'kernel31' of code.vuplus.com:/opt/repository/openembedded into kernel31

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