From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 6 Nov 2007 15:16:38 +0000 (+0000)
Subject: merge of 'c5d7d939915c058ea8efba4e6e2fa2e5f1648626'
X-Git-Tag: Release-2010-05/1~8454
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0eb3fa507e436d44b943bedfcd8afa5ff760971;p=openembedded.git

Merge ... 'c5d7d939915c058ea8efba4e6e2fa2e5f1648626'
     and 'd6978786d6310b56cb0f5a93790659cd481ca0d5'
---

f0eb3fa507e436d44b943bedfcd8afa5ff760971