merge of 4339c862c7e6e4f616af262e7f1adc11bcbd4f67
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Jul 2005 16:00:20 +0000 (16:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 16:00:20 +0000 (16:00 +0000)
commitc5c44512f1691fe9a7df3715d741ce00d42a66be
tree510d2617002260395ce73cbad41beb169a8f6498
parentb2d37c5ae5adef08d6895c76e1e45ce8569e769a
parent47c3eb79e440b488b9fad1f8d4003b34229b0007
merge of 4339c862c7e6e4f616af262e7f1adc11bcbd4f67
     and 91669c817133defa72ee377e661993b9a4e812c4