merge of 1fe9f8d43389439ccd8569c7e3d656fdc6e01b36
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 14 Jul 2006 09:27:02 +0000 (09:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Jul 2006 09:27:02 +0000 (09:27 +0000)
commit7cc05e04e43d8c7d1571f24435487cdee3effd49
tree96d59abf2f3e49279b8dc14d733183fbae8d088b
parent0579add1528b6c8f41fdd1f3d8ca4047f37a8a64
parentb89b784003713fc0e7eb20bd96069bf3ab5cca50
merge of 1fe9f8d43389439ccd8569c7e3d656fdc6e01b36
     and e67478401de677e4d3ab4253e5a93d4478cd694d