From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 24 Aug 2005 18:58:04 +0000 (+0000)
Subject: merge of 5a11cecc6df40454f52ac963fdc178b273327c14
X-Git-Tag: Release-2010-05/1~9453^2~3804^2~4^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9d0f8c79905d4c1d848890713a9be6b892830b6;p=openembedded.git

merge of 5a11cecc6df40454f52ac963fdc178b273327c14
     and 74801abfe9e66d4dbdeb7f2ac609b79f663a8558
---

f9d0f8c79905d4c1d848890713a9be6b892830b6