From: Frederic Bompart <frederic@unknown.openembedded.org>
Date: Thu, 1 Dec 2005 17:06:33 +0000 (+0000)
Subject: merge of 31055e640cd3ed10f565b48ba9c4ef57da2243cb
X-Git-Tag: Release-2010-05/1~9453^2~2988^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2d622b2a8d6d367f3a01366f1ae0bb5617f38f6;p=openembedded.git

merge of 31055e640cd3ed10f565b48ba9c4ef57da2243cb
     and d72c18a4bdb40a69e578b041fe714f31487fcb1e
---

b2d622b2a8d6d367f3a01366f1ae0bb5617f38f6