merge of 58b70d443320302d28d40f3bbd27c219a60956cb
authorMichael Lauer <mickey@vanille-media.de>
Wed, 7 Sep 2005 22:05:19 +0000 (22:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 22:05:19 +0000 (22:05 +0000)
     and d4055289778245dd9f7f2e2649e8a6d4935189fd


Trivial merge