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)
commitbc9f150c795666fc268a0d712b36bbc2eec94014
tree793466f165108b8502d8da93f9b9acff729d8b3c
parent78c41b8ffa5e5f91e7de94d51f9532ba7a7e12ce
parentb5da2584437b69726e13ff30ece841280d47296d
Merge commit 'origin_push/vuplus-1.6' into vuplus-1.6

Conflicts:
recipes/enigma2/enigma2-plugins.bb