From: Frederic Bompart <frederic@unknown.openembedded.org>
Date: Wed, 15 Feb 2006 12:53:24 +0000 (+0000)
Subject: merge of 6dfbf762c0efe217e0a64b119b456e471f667ae7
X-Git-Tag: Release-2010-05/1~9453^2~2306^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=839f76811d9a68c876a75acf15b8ccdc3507b872;p=openembedded.git

merge of 6dfbf762c0efe217e0a64b119b456e471f667ae7
     and d36f69289f03c75db72375cba8d47b713a10221e
---

839f76811d9a68c876a75acf15b8ccdc3507b872