merge of 8681a1676985a0df1f06fc59cc7f50915300e156
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Apr 2006 20:23:11 +0000 (20:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 20:23:11 +0000 (20:23 +0000)
commita4cc7eafc92ae64a228279a251f042c2372c84f8
treeceac47904a86a85a70b9d745d8bbf4758fae277f
parent732e71639329f21b7b4506acc5c189871d1eb8d0
parent2828bf476b4eb1496dcdd03bf74d0a40fcb7bc6a
merge of 8681a1676985a0df1f06fc59cc7f50915300e156
     and 86e9d63c930e7cda091f0ea8b0e2e7ee3dc1f93f