merge of 286a5cadf7726262c13fd2d631d3f2bf15fddf5f
authorMichael Lauer <mickey@vanille-media.de>
Wed, 27 Jul 2005 08:37:50 +0000 (08:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jul 2005 08:37:50 +0000 (08:37 +0000)
commitb16010c13c5451a8a610f4120e9a2dc33f920677
tree1cae49780124f0aa6bd3791e911f1e9911bb0a38
parentfc4e5c03f43cc293ee3384b46918badb0f53dfeb
parentc81a691e76610095bef2fea17be153a31fcc8e52
merge of 286a5cadf7726262c13fd2d631d3f2bf15fddf5f
     and 354e8aead2f1733a96819f95e5fa09d14685b639