merge of 60b47beac72c6f1f23514b42a309716b470d471b
authorMichael Lauer <mickey@vanille-media.de>
Wed, 20 Jul 2005 21:48:43 +0000 (21:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jul 2005 21:48:43 +0000 (21:48 +0000)
commit143f2c0ec97bacab5fefa9a5790bbad7373db9e7
tree5bb50161c482f521a17c6b424f959b2b55af6e78
parent17fcd2506c38346c8a72dd3cd567c4c4344b02b6
parent79854f3a16e4bd18ae87450fde8061778f192585
merge of 60b47beac72c6f1f23514b42a309716b470d471b
     and 7fbbef1848aa08b7ef6e7a00db436c1db5c2002e