From: Koen Kooi <koen@openembedded.org>
Date: Mon, 20 Feb 2006 21:45:59 +0000 (+0000)
Subject: merge of 50ca43556e311a226bcabbf74fef8be758ad8982
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~103
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cfbe5d6c94414f35d58c1007da1557e748a1e6f;p=openembedded.git

merge of 50ca43556e311a226bcabbf74fef8be758ad8982
     and 98e42d2d4e7f7bb636244875058f5bef36a594bc
---

5cfbe5d6c94414f35d58c1007da1557e748a1e6f