merge of 28bb58fd6f81a9c29ff99ea86b0e5dea519615de
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 25 Aug 2005 15:05:49 +0000 (15:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 15:05:49 +0000 (15:05 +0000)
     and c7f205e9170643601a9c390d8aeb65d0993e6caa


Trivial merge