merge of 853e35738795ae7caa7858e2df6f8cf805e42cc2
authorMichael Lauer <mickey@vanille-media.de>
Wed, 3 May 2006 14:29:36 +0000 (14:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 14:29:36 +0000 (14:29 +0000)
     and ddc2ba34a8ed2f37044bdcbbe0d0716407db6565


Trivial merge