merge of 94e87f750741788f0f284fbad40cb6eddee8f689
authorKoen Kooi <koen@openembedded.org>
Thu, 6 Jul 2006 13:01:47 +0000 (13:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 13:01:47 +0000 (13:01 +0000)
commitbe3adac48aa7d3ba50ea1b7c9c158ed592ba9f79
treed659de6b0e2945a94d32d1d110f4f1d69224891c
parentf25342b392946359010e999fd60415125e566004
parent5da2f4d0b4ca9c7b073f2888d77b1d12a7688743
merge of 94e87f750741788f0f284fbad40cb6eddee8f689
     and 9fcf759108403d55361b6910f3dbc57f0fa9431d