From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 13 Jan 2006 00:38:16 +0000 (+0000)
Subject: merge of 8c9119306b7c5e40fc88a0a35736702a0c1e03bc
X-Git-Tag: Release-2010-05/1~9453^2~2677
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c667bc6e10137c66787994dbc04050e5c37af200;p=openembedded.git

merge of 8c9119306b7c5e40fc88a0a35736702a0c1e03bc
     and a7c529e1ce5036ae5fa22e574e755f38d0b88a8e
---

c667bc6e10137c66787994dbc04050e5c37af200