From: Koen Kooi <koen@openembedded.org>
Date: Wed, 30 May 2007 14:07:56 +0000 (+0000)
Subject: merge of '9d80f6499c5d862fca19d620f8124ac061dbe754'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~139
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c339f4d93da370a1facd20dd6a8b84f1a531b3a0;p=openembedded.git

Merge ... '9d80f6499c5d862fca19d620f8124ac061dbe754'
     and 'c7115238d0f3b9fc3434adb41d77441a7ab96991'
---

c339f4d93da370a1facd20dd6a8b84f1a531b3a0