merge of 478afa572b085ffd7462b36a0578c6b3c783c9ef
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 4 Mar 2006 22:44:02 +0000 (22:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Mar 2006 22:44:02 +0000 (22:44 +0000)
     and 5ad87c11b1a8f58b866accc34540928d3da271e3


Trivial merge