From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 12 Jun 2006 17:28:05 +0000 (+0000)
Subject: merge of 12aa0c8ab97e48e880104ae70099396cfec730d0
X-Git-Tag: Release-2010-05/1~9453^2~1453^2~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=900015f63bd5445f2895ded7b6972026528f29cb;p=openembedded.git

merge of 12aa0c8ab97e48e880104ae70099396cfec730d0
     and 91a1b03bc990317ac44a440b58f5e1b171fc7234
---

900015f63bd5445f2895ded7b6972026528f29cb