merge of 6d3ab1c248e51c9e183169b8ec8cd0fee592080c
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jul 2005 14:21:42 +0000 (14:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 14:21:42 +0000 (14:21 +0000)
     and e0bd53b164a199028ffef45edeab4802fb20522b


Trivial merge