merge of 505f6e001e3fc7e1bda5010a429e1d963b181ba7
authorMichael Lauer <mickey@vanille-media.de>
Sat, 6 Aug 2005 13:27:42 +0000 (13:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Aug 2005 13:27:42 +0000 (13:27 +0000)
     and ebc68fd9ca2fd9efd955596d84e5d748bea4b8e4


Trivial merge