From: Koen Kooi <koen@openembedded.org>
Date: Sat, 20 May 2006 12:12:39 +0000 (+0000)
Subject: merge of 08292c00115e7d304ae354db337ee4feee93fd17
X-Git-Tag: Release-2010-05/1~9453^2~1665^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef655f681eefccbe8f16d76f954c434c52cb99a4;p=openembedded.git

merge of 08292c00115e7d304ae354db337ee4feee93fd17
     and 2a1f8d42cf0a5906c34ed8cd233648587be12c64
---

ef655f681eefccbe8f16d76f954c434c52cb99a4