merge of 11bb54e0cf52d0c5a23e20076d3797d35cd2e8e7
authorMichael Lauer <mickey@vanille-media.de>
Thu, 18 May 2006 23:41:17 +0000 (23:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 23:41:17 +0000 (23:41 +0000)
     and 8d2aa23a304d9d1a81851b96ec6e5cee74f24fe7


Trivial merge