From: Koen Kooi <koen@openembedded.org>
Date: Mon, 3 Jul 2006 11:47:09 +0000 (+0000)
Subject: merge of 54fc43a41a444cc06b399d28786e681cc3f280b0
X-Git-Tag: Release-2010-05/1~9453^2~1366^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deb7c0557bd30de7117ac42147292c07891a85e8;p=openembedded.git

merge of 54fc43a41a444cc06b399d28786e681cc3f280b0
     and e2cab234562f7dda172baed70a2d13541d0c63ff
---

deb7c0557bd30de7117ac42147292c07891a85e8