merge of 300f5db9f8e0ccf916ea03ecd5fc5ac7918cafc2
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 8 May 2006 14:12:16 +0000 (14:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 May 2006 14:12:16 +0000 (14:12 +0000)
     and 735fb263a309dee38c3b649227cd8c50308fca68


Trivial merge