merge of b9308de4d2d1072e26d134bd4eada0efa17993f6
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Apr 2006 12:32:45 +0000 (12:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 12:32:45 +0000 (12:32 +0000)
     and efd8840244d74e5cab246e93e24993c96eeb9db8


Trivial merge