merge of 1bacecb273540857245889bce3c3159044e52cea
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 14 Jul 2006 11:03:54 +0000 (11:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Jul 2006 11:03:54 +0000 (11:03 +0000)
     and 9a8086a7ff5fe6e62dcc5a0ac06f8c0faa16c215


Trivial merge