From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 22 Apr 2006 21:11:33 +0000 (+0000)
Subject: merge of 3a6c0a29d29ed10272278e0c212ee87508ffe416
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=323c296bf4b2260fc9d17000b9756f54a6c51e16;p=openembedded.git

merge of 3a6c0a29d29ed10272278e0c212ee87508ffe416
     and 3d32d5cfdac5307f5ee1b8a7f9cf0f1c79278f03
---

323c296bf4b2260fc9d17000b9756f54a6c51e16