From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 2 Sep 2005 21:36:23 +0000 (+0000)
Subject: merge of bab884274cd6fd78f200a46137109bede4c17e25
X-Git-Tag: Release-2010-05/1~9453^2~3678^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7af1ffb7645eea266c98cd9b64d60a2ddd84378e;p=openembedded.git

merge of bab884274cd6fd78f200a46137109bede4c17e25
     and d83dde07166637966b2851273fb1192e98171072
---

7af1ffb7645eea266c98cd9b64d60a2ddd84378e