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)
commitb46f17239ea98883630b1a22fa82cb6cbf4ed0bc
tree5e1431bcb022723cb16d4e601a487a928a9aa9ee
parentcf4e0e40139b5127918c03bdaedd8f7570efaece
parentdf74e8c851289bb212fd2d7ca4a16ee1c143a81b
merge of 72af984e29557c3fa599bd1cfa5aacc5bf3ada8c
     and f44ffed4d1c961106d82ea95f9bb41d70cd60e66