merge of 94291eae06928b22e09d03d183930448448dbfc1
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 12 Jul 2006 00:36:58 +0000 (00:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 00:36:58 +0000 (00:36 +0000)
     and c5b3cb5a9771aadc23fcc3fb7f9c4dcd0feca7ad


Trivial merge