merge of 6dfbf762c0efe217e0a64b119b456e471f667ae7
authorFrederic Bompart <frederic@unknown.openembedded.org>
Wed, 15 Feb 2006 12:53:24 +0000 (12:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 15 Feb 2006 12:53:24 +0000 (12:53 +0000)
     and d36f69289f03c75db72375cba8d47b713a10221e


Trivial merge