merge of 28b5204f533562d4df4b43cde7bbc16981fb0d0a
authorMichael Lauer <mickey@vanille-media.de>
Sun, 2 Jul 2006 13:55:14 +0000 (13:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Jul 2006 13:55:14 +0000 (13:55 +0000)
     and 2bb3d19276030cbe60359b8392b763021c776513


Trivial merge