merge of 5180d45d06f92e034b4c024f4f52e16d157aa0d9
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 12 Jul 2006 13:49:19 +0000 (13:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 13:49:19 +0000 (13:49 +0000)
     and 596b10cd24c63dccc9c168ee841040c9f8615e50


Trivial merge