merge of 62f17dde6e02af42bf4eab7e425978b66cea3823
authorMichael Lauer <mickey@vanille-media.de>
Thu, 4 Aug 2005 16:14:36 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 16:14:36 +0000 (16:14 +0000)
commitc1bd6a8c28ffb85dd2f786d2bdf99b88316012c7
tree2de5fc793f0d4682186117b5dca6178f6e5d1a25
parent97a470b34756cfdde62dbd67dcd87f686b73e4fd
parent304c18632bf0ecf124285b737bb4cc8d2b0f561d
merge of 62f17dde6e02af42bf4eab7e425978b66cea3823
     and 7b0d9a3014b9a4ec491547577decf4b403df8b04