merge of 330dd41d9c920bd7109ac7473efd170ce60c9cf7
authorKoen Kooi <koen@openembedded.org>
Fri, 17 Feb 2006 20:27:38 +0000 (20:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 17 Feb 2006 20:27:38 +0000 (20:27 +0000)
commitef71654f8794259f649eecbedd5b37888e18aecc
tree6d1cfb9b3870bdaf77374b5d28af01fe56756c51
parentb6e66d13b1826c385e79e786d78614a4a2d7e4e7
parent5407170fb15fb1c355202b2113aecd36a3213881
merge of 330dd41d9c920bd7109ac7473efd170ce60c9cf7
     and 748f1a9f0463ad5857b3efee6469b0f01c2c5d14