From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 5 Jul 2006 10:51:01 +0000 (+0000)
Subject: merge of be8473f770fde97a98916a81842a608af462fbbb
X-Git-Tag: Release-2010-05/1~9453^2~1339^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5660614357fa8c812eda72a06a56326eba4f3d06;p=openembedded.git

merge of be8473f770fde97a98916a81842a608af462fbbb
     and bfd44a04ed00cc5b4a427438233fdc3637e8f9b0
---

5660614357fa8c812eda72a06a56326eba4f3d06