merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 13 Jan 2006 22:50:24 +0000 (22:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 22:50:24 +0000 (22:50 +0000)
     and e118e6eeb9d00fb7d7577c8cfdea6ed409fdc2a9


Trivial merge