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)
     and b9e97e1ac980472265e7715ad0f37be8f9a86454


Trivial merge