From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 7 Sep 2005 09:27:59 +0000 (+0000)
Subject: merge of a08a8c2025a026a3e9ef70601ea1f262a6fa6f33
X-Git-Tag: Release-2010-05/1~9453^2~3625
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28e286f2287e335dcf48ef9cf945b58b8565b0c4;p=openembedded.git

merge of a08a8c2025a026a3e9ef70601ea1f262a6fa6f33
     and feb0ee96425b8d0d94fb0ed0f4b74d16f9e7678c
---

28e286f2287e335dcf48ef9cf945b58b8565b0c4