From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 5 Mar 2006 16:22:01 +0000 (+0000)
Subject: merge of 2d917a9725f84078c390a35764f260c9abbef0f6
X-Git-Tag: Release-2010-05/1~9453^2~2285
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e9b731907f73dd0488ebdc1ef9a89d0ce62c3cd;p=openembedded.git

merge of 2d917a9725f84078c390a35764f260c9abbef0f6
     and 4a411456169f13d81227a8f0f0087490f6b68814
---

8e9b731907f73dd0488ebdc1ef9a89d0ce62c3cd