From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 4 Apr 2007 11:10:15 +0000 (+0000)
Subject: merge of '487b26a10d1dba93c52637b9458e55e24907a81c'
X-Git-Tag: Release-2010-05/1~8868^2~780^2~17
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fda8f71205f8a71f9f0faf2fa9a538a2c1df43c;p=openembedded.git

Merge ... '487b26a10d1dba93c52637b9458e55e24907a81c'
     and '5a224ad42c629112a32b3825f26fb2c33dee1b3b'
---

9fda8f71205f8a71f9f0faf2fa9a538a2c1df43c