merge of 2f7b3d5a4cb419e012fd15bb7d621b195cd4bc84
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 26 Aug 2005 16:33:10 +0000 (16:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Aug 2005 16:33:10 +0000 (16:33 +0000)
     and 32b3aa5b585c31c96bc1f6e98bc36a1a56f87166


Trivial merge