From: Koen Kooi <koen@openembedded.org>
Date: Mon, 3 Jul 2006 12:10:15 +0000 (+0000)
Subject: merge of 5dbe23f7d98cb390990ba2c2f1ad27667148516a
X-Git-Tag: Release-2010-05/1~9453^2~1360^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fd4ba0f952ce906c70ad9548d213e8c9439f10d;p=openembedded.git

merge of 5dbe23f7d98cb390990ba2c2f1ad27667148516a
     and 6a9ce130c03dd16448d55d8b7638ee894776e022
---

5fd4ba0f952ce906c70ad9548d213e8c9439f10d