merge of 72af984e29557c3fa599bd1cfa5aacc5bf3ada8c
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 21 Jun 2006 09:14:53 +0000 (09:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 09:14:53 +0000 (09:14 +0000)
     and f44ffed4d1c961106d82ea95f9bb41d70cd60e66


Trivial merge