merge of 063a83fd9a6c656a5d54258b7c3e437e159f7302
authorKoen Kooi <koen@openembedded.org>
Mon, 5 Jun 2006 16:41:53 +0000 (16:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Jun 2006 16:41:53 +0000 (16:41 +0000)
commitaeba6e600acc9f4187b395e2fcbcbc77387947d3
treebc14819dc11bf6e1b0f678893b2f03edad0effe8
parentf162bfbee5d0dcb896b7361344adec9bd8df84be
parent2e48170899c8c179a213cc668bb05424dca43bb9
merge of 063a83fd9a6c656a5d54258b7c3e437e159f7302
     and e754f038eb03281981bba6e48f154314cd9f8a79