From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 Sep 2005 12:14:05 +0000 (+0000)
Subject: merge of 1e90bf9bb883c8aeccaddeaac59be01a87a31dc3
X-Git-Tag: Release-2010-05/1~9453^2~3518
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cec244e14b47f177c98cdd9f926621e023bbfb32;p=openembedded.git

merge of 1e90bf9bb883c8aeccaddeaac59be01a87a31dc3
     and 93e4964f1376f079c8cf01b587408e5385db587f
---

cec244e14b47f177c98cdd9f926621e023bbfb32