merge of 16b6051835bf1cfb727403fbce8d2d3a2532956d
authorMichael Lauer <mickey@vanille-media.de>
Wed, 3 May 2006 21:43:35 +0000 (21:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 21:43:35 +0000 (21:43 +0000)
commite5a2b43fc5b66de287fd24bb721b520df68aa63c
treefe0e0ab1e03633c7398043e241ae9decbc6bdd36
parent62939b1a74e7b13e9dd76408ef64da2d1dd1a376
parent59a67e65a62f1fd7f39122ae9d61cf17438d7870
merge of 16b6051835bf1cfb727403fbce8d2d3a2532956d
     and b9e97e1ac980472265e7715ad0f37be8f9a86454