merge of 0aa8013267614c94b0122ab5b95c006413d93be2
authorMichael Lauer <mickey@vanille-media.de>
Mon, 11 Jul 2005 21:00:21 +0000 (21:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jul 2005 21:00:21 +0000 (21:00 +0000)
     and 24a509421f0088ff76c3cdd4736508a7c4b02a86


Trivial merge