merge of 492a286523344c6075a8e8afbb49f5b13be91738
authorMichael Lauer <mickey@vanille-media.de>
Sat, 22 Apr 2006 16:00:51 +0000 (16:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 22 Apr 2006 16:00:51 +0000 (16:00 +0000)
commitbc8717fdc175eaa41759eb91179af83e105e075e
tree0d6024fec02028a009e6e21b40c6bbede83edb0f
parentb74b8e5d2149a54645997ab9948e9a6f9ec94015
parent1f7d543e6b0343bafac678cffc4bd716777fe11b
merge of 492a286523344c6075a8e8afbb49f5b13be91738
     and d68918ea3df82803fb2bfefa0cbbdac04811caa7