merge of 4b8efd8ea23df73f8397284e81b3d7ba92173f77
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 1 Dec 2005 19:14:01 +0000 (19:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 19:14:01 +0000 (19:14 +0000)
     and b17f8aca9921dd6c79812ee173e34e711b252634


Trivial merge