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

merge of 4a2c16678b05253a5736aa917a28e66052c746f8
     and beb1b8b2c854886cbbad1a336b492fa8b7ad78be
---

504ee24ca6fe600c0d2586d78aa9ad8b17510f14