merge of 7484256711bab20f56c5b8cfe94ae9c4a0fac36a
authorMichael Lauer <mickey@vanille-media.de>
Wed, 12 Jul 2006 21:36:47 +0000 (21:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 21:36:47 +0000 (21:36 +0000)
     and b2faac906eea0c47c1b5d14cff00776242589b25


Trivial merge