From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 5 Aug 2006 10:29:42 +0000 (+0000)
Subject: merge of eb7d96a0afd303253a978ec21808298060b90fc2
X-Git-Tag: Release-2010-05/1~9453^2~999^2~20^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dc1f4375613f88ec1a0267bbf7599864241be0b;p=openembedded.git

merge of eb7d96a0afd303253a978ec21808298060b90fc2
     and f01470a8f69abdfa702a7b6f512c94c9821e4ac7
---

4dc1f4375613f88ec1a0267bbf7599864241be0b