merge of 28a5dee63c03c0d1372c9c00f5faaee2054fc87c
authorMichael Lauer <mickey@vanille-media.de>
Sat, 20 May 2006 11:53:06 +0000 (11:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 11:53:06 +0000 (11:53 +0000)
     and 91ec22075c5dc6f8ba0182e3781c2c79b37a8ba6


Trivial merge