From: Koen Kooi <koen@openembedded.org>
Date: Tue, 16 May 2006 10:20:18 +0000 (+0000)
Subject: merge of 2d74ab18755124460de464b7d2ee0ce76344837e
X-Git-Tag: Release-2010-05/1~9453^2~1692^2~11^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d97c867f1ae7174c9e31e175aadb09e56494699;p=openembedded.git

merge of 2d74ab18755124460de464b7d2ee0ce76344837e
     and 398443d538482a6003cb29221382acd4afbde19e
---

7d97c867f1ae7174c9e31e175aadb09e56494699