merge of 160720a48fbbbc4d952d090bb639c0f278e17f2f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 29 Aug 2005 21:47:46 +0000 (21:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Aug 2005 21:47:46 +0000 (21:47 +0000)
     and 558bb65faf7c2974476686b49c96141cd99dd145


Trivial merge