merge of 5e069de84dc8d0ae51245045a22e3495ec81393d
authorKoen Kooi <koen@openembedded.org>
Tue, 26 Jul 2005 11:16:30 +0000 (11:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Jul 2005 11:16:30 +0000 (11:16 +0000)
commit557bc3fd40a64767ed4d350f6aa12101507a9a84
treeaa1c4b0cfac4d052baa1b1502edcc367cfe6b1e5
parent253be08510c6def70b3344a108a5bb2522c39490
parentda6ca80509bdbbad9c4e888b848e022229cee52b
merge of 5e069de84dc8d0ae51245045a22e3495ec81393d
     and bebf3d3ba6e6b56ee7785b02e70331b4222dc590