From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 2 Apr 2007 16:52:13 +0000 (+0000)
Subject: merge of 'd49bb94575326116c1e8f8c649730d522f234dae'
X-Git-Tag: Release-2010-05/1~8868^2~848
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=165994754ebf7e0c0580ccef01bfb72610652d15;p=openembedded.git

Merge ... 'd49bb94575326116c1e8f8c649730d522f234dae'
     and 'e4274d99726eb383f5eb120ad5097b8cc4483143'
---

165994754ebf7e0c0580ccef01bfb72610652d15