merge of be8473f770fde97a98916a81842a608af462fbbb
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Jul 2006 10:51:01 +0000 (10:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 10:51:01 +0000 (10:51 +0000)
     and bfd44a04ed00cc5b4a427438233fdc3637e8f9b0


Trivial merge