merge of 'b4b01fb4e8b3ecffccf4533846f88e2458fe7362'
commit6923c6ee9efc8e3b685a153bc28342d62471e7bf
author <oe@openembedded.org> <>
Thu, 15 May 2008 18:57:09 +0000 (15 18:57 +0000)
committer <oe@openembedded.org> <>
Thu, 15 May 2008 18:57:09 +0000 (15 18:57 +0000)
tree503ab1e077a78ed91dce938fb5c36d2524f980f1
parent206de10855cfb45abaa5cb709d56e3cd4d42d552
parent0df9a39f3bd2d6c923d76e4e4bc23b999043d263
Merge ... 'b4b01fb4e8b3ecffccf4533846f88e2458fe7362'
     and 'ba129bd9e38e74717e81d25413881c72841b72fc'