merge of 39a66ef7f4c4fa168070a43466472921e43df04d
authorKoen Kooi <koen@openembedded.org>
Tue, 20 Dec 2005 12:22:34 +0000 (12:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 12:22:34 +0000 (12:22 +0000)
commit75fef018ffc2fe8054b6f8c30b909e9b94ac9a47
treeda4d75d381212ed2debff60f7911cd9996052d5b
parentd12338905b7ac84bab70ecf0f4e3d7f704c7fe99
parentcb2d3b7f87c78ddcb9cd639516d177bdfd017c9b
merge of 39a66ef7f4c4fa168070a43466472921e43df04d
     and fa51703129c94d391a49cd73b3663c986c5c7314