merge of b19adf0c94378bc7f986e8f497a7aed16f2453b8
authorMichael Lauer <mickey@vanille-media.de>
Sat, 6 Aug 2005 21:37:30 +0000 (21:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Aug 2005 21:37:30 +0000 (21:37 +0000)
     and bc7105815352b23ea8f59490f29698429c7c08f1


Trivial merge