merge of 6a09c229506ea55e94d418d22f102bba3d356a32
authorMichael Lauer <mickey@vanille-media.de>
Fri, 30 Jun 2006 13:16:28 +0000 (13:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Jun 2006 13:16:28 +0000 (13:16 +0000)
     and cc1957ee71fb122edc5add46a814a263c80bbe85


Trivial merge