merge of 80f6af3e8d9657bdfa59fa62d84fe03c09d93944
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Mar 2006 01:37:05 +0000 (01:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Mar 2006 01:37:05 +0000 (01:37 +0000)
     and ba687e58e5920f60f96f8753b6d3e6dba22c0dad


Trivial merge