From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 30 Aug 2005 21:38:44 +0000 (+0000)
Subject: merge of 8fc2532eab5aa18bfb78e2d7db01f371bf7f1383
X-Git-Tag: Release-2010-05/1~9453^2~3678^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da4ed22a4162ac593800db8dfca89742ef073758;p=openembedded.git

merge of 8fc2532eab5aa18bfb78e2d7db01f371bf7f1383
     and ab4df7cd03bb471e7360921c6274b4b851271f00
---

da4ed22a4162ac593800db8dfca89742ef073758