merge of 09a8da47b54f1328431c3acf759622b48a210fb1
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 3 Jul 2005 16:07:18 +0000 (16:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 16:07:18 +0000 (16:07 +0000)
     and 9495acb7fa79535be3dc1aec9165fc8dfa1b0ccf


Trivial merge