Merge commit 'origin_push/vuplus-1.6' into vuplus-1.6
authorschon <schon@dev03-server>
Thu, 17 Jun 2010 07:15:23 +0000 (16:15 +0900)
committerschon <schon@dev03-server>
Thu, 17 Jun 2010 07:15:23 +0000 (16:15 +0900)
Conflicts:
recipes/enigma2/enigma2-plugins.bb


Trivial merge