merge of b2aabdd1853c4273f9ce3ab3d26acd034460ec1c
authorMichael Lauer <mickey@vanille-media.de>
Sun, 16 Apr 2006 14:40:35 +0000 (14:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Apr 2006 14:40:35 +0000 (14:40 +0000)
     and dcff2c4c5128ab25e2593ca84778d2a405fb7cb3


Trivial merge