From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 22 May 2007 15:18:21 +0000 (+0000)
Subject: merge of '2f33e3153b5f921d4625e4f8ea16adf0f25d161c'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~196
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f7f71458454c6780cb437f8c0e86624cadc0460;p=openembedded.git

Merge ... '2f33e3153b5f921d4625e4f8ea16adf0f25d161c'
     and '502da1565df8ea89aed66c5cfc7dee8319969c68'
---

4f7f71458454c6780cb437f8c0e86624cadc0460