From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 19 Jan 2006 20:01:55 +0000 (+0000)
Subject: merge of 827f4059e04553066f724435440d24ddd9d922cb
X-Git-Tag: Release-2010-05/1~9453^2~2617
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23d83aae581d459ce51237b5cdcfc8330bb3529d;p=openembedded.git

merge of 827f4059e04553066f724435440d24ddd9d922cb
     and 9b2d4fdceb2f6fd916a463de425a0480831dd0af
---

23d83aae581d459ce51237b5cdcfc8330bb3529d