merge of 19c9c34826590fe580ab36a128422e4fb4c3f6b8
authorMichael Lauer <mickey@vanille-media.de>
Wed, 29 Mar 2006 13:11:26 +0000 (13:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 29 Mar 2006 13:11:26 +0000 (13:11 +0000)
     and f0b12dffc2020212cecbe63130285d68a1897b93


Trivial merge