Merge branch 'vuplus-1.6' of origin into vuplus-1.6
authorschon <schon@dev03-server>
Tue, 22 Mar 2011 08:30:00 +0000 (17:30 +0900)
committerschon <schon@dev03-server>
Tue, 22 Mar 2011 08:30:00 +0000 (17:30 +0900)
commit6ed16a5e9aca5dd7821bcddbbbed74724f2f58cf
tree47ddeb366ee722c2059c6f6c8818c88c938048b1
parentc3a7bb48e08350d8e72c8b7ec5b5a39c367a1b6a
parentb1b1de6c053a4b8cfd4cd3e4c1c24746fa435934
Merge branch 'vuplus-1.6' of origin into vuplus-1.6

Conflicts:
recipes/linux/linux-vusolo_2.6.18.bb
conf/machine/vusolo.conf