merge of 551667095e22fd8245f03b1ae7d45c0c5a3ec1c3
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 25 Apr 2006 19:51:27 +0000 (19:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 19:51:27 +0000 (19:51 +0000)
     and caff9d7758bbac1a8819824a3d56cef092f94ca8


Trivial merge