merge of 14beb6e3b60e8a96ea90e6228aed0ecce61cba68
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Jul 2005 23:12:58 +0000 (23:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 23:12:58 +0000 (23:12 +0000)
commit5dde0ce2044f763504169167ea2334b1992e4c61
tree14ae460247e6a0462c2692239af3986ad6c35e77
parentbb93bdf4d67da4286ca0ee5e27c13ba5fd920894
parentb99ce69d58a268469360d72095288d3342f20f5a
merge of 14beb6e3b60e8a96ea90e6228aed0ecce61cba68
     and 68aa0d882dcad7cf44d1b57c0264ab1ecd1ea9de