From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Fri, 7 Jul 2006 10:20:51 +0000 (+0000)
Subject: merge of 8a2023ca2f97d50fba9ee9d052e5353b46eda98f
X-Git-Tag: Release-2010-05/1~9453^2~1301^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d5b724cc8dece3e75cd65f8ce8077564bdea331;p=openembedded.git

merge of 8a2023ca2f97d50fba9ee9d052e5353b46eda98f
     and ca2a10421cd90e75a5f22530f259d62b15f51929
---

5d5b724cc8dece3e75cd65f8ce8077564bdea331