merge of 0e2a091a9cb5f25d70d0e869994470d0f2741e4c
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Sep 2005 09:37:29 +0000 (09:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 09:37:29 +0000 (09:37 +0000)
     and c170fc6105995095978ef3788853381d06ff2cf9


Trivial merge