From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 Apr 2006 20:07:17 +0000 (+0000)
Subject: merge of 852e43ffea417b36fb0ec4e3a883e91cb7960eb6
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9b62f99005396a1d1f02649abe11574ccb31a82;p=openembedded.git

merge of 852e43ffea417b36fb0ec4e3a883e91cb7960eb6
     and f0718c495b9b8c246565ee2c07956b9356eab01b
---

d9b62f99005396a1d1f02649abe11574ccb31a82