merge of 865901d3478c57c034f017d899de72e3a1d305be
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Sep 2005 20:05:04 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 20:05:04 +0000 (20:05 +0000)
commite3112666840c08c242b36d5047fab2ff44c496b6
tree6821ea6ef34be86cb2927d0c4d7415167d853ce5
parentbc42c0a4948678f89fb28bfe0391a9cf91f49420
parentae1d344c4d4aaa25a812cbbff2f816d8167eda8d
merge of 865901d3478c57c034f017d899de72e3a1d305be
     and ff8482dffaa2fde2376b39d9666e0598a8beae83