merge of e54d3f9c3cb5f2e740cd272a75c02eb49d140803
authorMichael Lauer <mickey@vanille-media.de>
Sun, 23 Apr 2006 18:55:53 +0000 (18:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 18:55:53 +0000 (18:55 +0000)
     and edb2b19eb6adbfa6e9319d29bed8c5ca6eedfd06


Trivial merge