From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 22 May 2007 09:59:37 +0000 (+0000)
Subject: merge of '37e29e33ed5a8bc07374cf9980746d5aba2c6a90'
X-Git-Tag: Release-2010-05/1~8868^2~403
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10013e9ed4e79a2f6ca0ceb6451787aaa47c46e5;p=openembedded.git

Merge ... '37e29e33ed5a8bc07374cf9980746d5aba2c6a90'
     and '5315b48797a90da8300454374f0e8dd43d8b3658'
---

10013e9ed4e79a2f6ca0ceb6451787aaa47c46e5