From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 17 Jul 2008 19:04:31 +0000 (+0000)
Subject: merge of '05e9902f277de28b4e08c6bb6aff89f8862b84ac'
X-Git-Tag: Release-2010-05/1~6454^2~8^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e0a1576c8bae32c418a5fab4d7c936ecee814f6;p=openembedded.git

Merge ... '05e9902f277de28b4e08c6bb6aff89f8862b84ac'
     and '912f388483a3e1703ca89d7b2309723fd3407420'
---

7e0a1576c8bae32c418a5fab4d7c936ecee814f6