From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 5 May 2006 15:47:10 +0000 (+0000)
Subject: merge of 542b1a3d999b25674ade56ded685c4211f27090f
X-Git-Tag: Release-2010-05/1~9453^2~1751^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6938c5435a96be5dea0b4a62c9e74366dbd166b1;p=openembedded.git

merge of 542b1a3d999b25674ade56ded685c4211f27090f
     and b69c981e27fd4ef4c385796d80f1095b8859ce1c
---

6938c5435a96be5dea0b4a62c9e74366dbd166b1