From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 6 Jul 2006 16:19:33 +0000 (+0000)
Subject: merge of 6957560e17a99bdee10607797a02209bcfaeed94
X-Git-Tag: Release-2010-05/1~9453^2~1315
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=336ccfe6e95e0db69098c5dad1d56adec0b3cee2;p=openembedded.git

merge of 6957560e17a99bdee10607797a02209bcfaeed94
     and c6de91971461be680012cd5aa78de999ad8b1684
---

336ccfe6e95e0db69098c5dad1d56adec0b3cee2