merge of 9493767780c108c1eb032fd49a0a9898244577b9
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 3 Jul 2005 17:06:08 +0000 (17:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 17:06:08 +0000 (17:06 +0000)
     and c82bfc5b903cf0dade276c5bd6e1312736edeece


Trivial merge