Merge branch 'vuplus-1.6' of origin into vuplus-1.6
authorschon <schon@dev03-server>
Tue, 22 Mar 2011 09:26:22 +0000 (18:26 +0900)
committerschon <schon@dev03-server>
Tue, 22 Mar 2011 09:26:22 +0000 (18:26 +0900)
commit56d5d9dfd0b0b1e8b8528943c8a0eb108731f164
treeebd43d9268efcf0c20f23a6b3311d01f648c13f4
parentc7d11c6e8770b4ca95c5112020f71170c269faf8
parent0e189961b818c015a42a0aca87495e6b9eaaeddd
Merge branch 'vuplus-1.6' of origin into vuplus-1.6

Conflicts:
recipes/linux/linux-vusolo-2.6.18/vusolo_defconfig