merge of 0bda2d2be880e8f2511362475ca94c7fccbe18db
authorMichael Lauer <mickey@vanille-media.de>
Sun, 11 Jun 2006 08:58:17 +0000 (08:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Jun 2006 08:58:17 +0000 (08:58 +0000)
     and 21e0b3e6f31b3802c08eabc0c9c109ae745596a0


Trivial merge