From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 4 Jul 2006 14:41:07 +0000 (+0000)
Subject: merge of 3a5832d4912a64e85b05315eb3993311efbecb59
X-Git-Tag: Release-2010-05/1~9453^2~1345^2~8^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51a75bba4fdaf12f51acc4823cdc86eb3efc0c06;p=openembedded.git

merge of 3a5832d4912a64e85b05315eb3993311efbecb59
     and f98077b2233306af226b7ac750bc1184a00e83f3
---

51a75bba4fdaf12f51acc4823cdc86eb3efc0c06