From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Mon, 21 Aug 2006 15:12:39 +0000 (+0000)
Subject: merge of e5fc9068f8cf1cbab5a9388e11725f13093edecf
X-Git-Tag: Release-2010-05/1~9453^2~911^2~16^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6737e48d301c06d12104dfb99264265999b6ae2b;p=openembedded.git

merge of e5fc9068f8cf1cbab5a9388e11725f13093edecf
     and ea9b59951b121a56e58b685121cca7b6ddca895e
---

6737e48d301c06d12104dfb99264265999b6ae2b