From: Koen Kooi <koen@openembedded.org>
Date: Fri, 22 Jun 2007 07:49:23 +0000 (+0000)
Subject: merge of 'a2a414dc8c26784dc8f35ecddb62ca87e5d0f634'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9a32cf9034963872a0ae44036f0ecfb2a7069c0;p=openembedded.git

Merge ... 'a2a414dc8c26784dc8f35ecddb62ca87e5d0f634'
     and 'e41ad38990f6485eb33ce1902f7cd10880deba5b'
---

a9a32cf9034963872a0ae44036f0ecfb2a7069c0