merge of 46964b2367c68919c05de337c00dfb0f80a7bc6f
authorKoen Kooi <koen@openembedded.org>
Thu, 4 May 2006 11:58:17 +0000 (11:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 May 2006 11:58:17 +0000 (11:58 +0000)
commit4e576d874c40f5358b6f3df70bb10bbcd2ae1717
tree3f1479eef20a697bd6b8b5a0bbc45153809d7787
parentf7dc666421ae0de3d8859aad345239cd13bcc256
parent079dcb139403431fb19b752df884fc14aa506abe
merge of 46964b2367c68919c05de337c00dfb0f80a7bc6f
     and 9ff24ed6ad4819ce51140dd2c4bd56863c7229be