merge of 04e09174bf8e53fb7de4e212a13de0b81d84852a
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 2 Aug 2005 12:06:17 +0000 (12:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 12:06:17 +0000 (12:06 +0000)
     and 0eaad42e46d96150ef12301851863ae8bc120c52


Trivial merge