merge of 5163269103c7a889fa4bcc1beee6b8f4d5a63ef5
authorMichael Lauer <mickey@vanille-media.de>
Wed, 7 Sep 2005 17:41:28 +0000 (17:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 17:41:28 +0000 (17:41 +0000)
     and 5d9c9e1e7d8e9bfb4ecb318701b739f787d59842


Trivial merge