merge of b8ec663985e414ccfe39f06489f001bf60b50a0b
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 3 Feb 2006 21:10:17 +0000 (21:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Feb 2006 21:10:17 +0000 (21:10 +0000)
     and cecb9f4ed88a2986bdd6aa503026a79211b79375


Trivial merge