merge of fb53c03fb636482fe26316e5adacbaeb4ddd5634
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Jun 2006 18:23:46 +0000 (18:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 18:23:46 +0000 (18:23 +0000)
     and c2029c080c2c9d3dc9675ff97d1ff45df7c5fd08


Trivial merge