From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 31 Aug 2005 17:36:00 +0000 (+0000)
Subject: merge of aa6dd7e7c843edc1fda899b776ca86237a4034d8
X-Git-Tag: Release-2010-05/1~9453^2~3678^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0efdc7fcf146d35f323a03133513f13b6053edf9;p=openembedded.git

merge of aa6dd7e7c843edc1fda899b776ca86237a4034d8
     and dc7f6044d78f5e21fcbae37faf420229603fd177
---

0efdc7fcf146d35f323a03133513f13b6053edf9