From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 23 Jul 2006 14:23:47 +0000 (+0000)
Subject: merge of 4986fed9f3de1a9c41e2d80bbe84ae27b1fc14fa
X-Git-Tag: Release-2010-05/1~9453^2~1196
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8635d225db11e930a0e8ee28e28bb19f947a159d;p=openembedded.git

merge of 4986fed9f3de1a9c41e2d80bbe84ae27b1fc14fa
     and 6e33e6f5b302b27119a3f49eb2dae64ee0db7ec5
---

8635d225db11e930a0e8ee28e28bb19f947a159d