From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 22 May 2007 10:30:21 +0000 (+0000)
Subject: merge of '1363ef74e5eef89aecd3b1cd42142546b27d3d6a'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~200
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=729c54400c5ed5b51fbdc579de768d45ce212c67;p=openembedded.git

Merge ... '1363ef74e5eef89aecd3b1cd42142546b27d3d6a'
     and '37e29e33ed5a8bc07374cf9980746d5aba2c6a90'
---

729c54400c5ed5b51fbdc579de768d45ce212c67