merge of 028fac41fd6e3c12693a33f64dc1e331c0270149
authorMichael Lauer <mickey@vanille-media.de>
Thu, 30 Mar 2006 15:52:16 +0000 (15:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Mar 2006 15:52:16 +0000 (15:52 +0000)
     and fb0a7d68e12187b6fa7e65a6685bd6a7244b9484


Trivial merge