From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 23 Aug 2006 19:22:52 +0000 (+0000)
Subject: merge of 2694ea866aead6f6639b0c69c13127c90f95e5ff
X-Git-Tag: Release-2010-05/1~9453^2~911
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68be6099dd326f7e48422cf3cacab6433b360260;p=openembedded.git

merge of 2694ea866aead6f6639b0c69c13127c90f95e5ff
     and c02b3cdfadfa7f433fd5ca7a0ffcb6f329cadbaf
---

68be6099dd326f7e48422cf3cacab6433b360260