merge of 6f3628b0dba700cfacce31a608706bb638c5c134
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Feb 2006 09:58:37 +0000 (09:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 09:58:37 +0000 (09:58 +0000)
commit9a4afa4e347b3849b08a8fbac8883ab558025a24
treee4586a44bfc246a81f4ee6b2f9b4924e9c3a141b
parent07b158305169ef976ad32e2bfbc87a1808ed58fd
parent81b2d93f4ec268fe52f47d414b2881f754458d13
merge of 6f3628b0dba700cfacce31a608706bb638c5c134
     and e7ddf084f75a5ee0d7e8ea106ce96c37362b4e64