merge of 694e3e889df61d4f0755b908f187cc494887e701
authorKoen Kooi <koen@openembedded.org>
Sat, 23 Jul 2005 19:32:26 +0000 (19:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 19:32:26 +0000 (19:32 +0000)
commit9ad6142885c827a87dae653cf44fc8b8af54188d
treeb202dfa96cf3a78edafcd6388b5bd53c901d2210
parent0cf7dfdc769a93e1128428c3c3a96861cd97da25
parent51c219a311de2d44f8967179b6711010352607de
merge of 694e3e889df61d4f0755b908f187cc494887e701
     and 8b4259611fcc8bb40ab81877e66247b9f42bdb38