From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 18 Aug 2005 09:46:07 +0000 (+0000)
Subject: merge of 29709b7d5d5e2ec13e3b1968de4a6da6f657adbc
X-Git-Tag: Release-2010-05/1~9453^2~3891
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d4ca551face6f67caf520ae1d3710111ba71b6a;p=openembedded.git

merge of 29709b7d5d5e2ec13e3b1968de4a6da6f657adbc
     and b81b0e61bfce121f10d42e327ea1df89155f5110
---

0d4ca551face6f67caf520ae1d3710111ba71b6a