From: Koen Kooi <koen@openembedded.org>
Date: Thu, 29 Jun 2006 18:19:14 +0000 (+0000)
Subject: merge of a0bb6704d46edd06e3acb50139d67212a028aa50
X-Git-Tag: Release-2010-05/1~9453^2~1400^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbe5e91953b85e141b7823e4c00c896b42b6a91e;p=openembedded.git

merge of a0bb6704d46edd06e3acb50139d67212a028aa50
     and ec186ae975c7b81c6668e0e2e7ba362a9801af90
---

cbe5e91953b85e141b7823e4c00c896b42b6a91e