From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 6 Apr 2006 22:39:32 +0000 (+0000)
Subject: merge of 5945a66a6847c21d25595376695c23f3971f6f8a
X-Git-Tag: Release-2010-05/1~9453^2~2086^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c97f56d28872da36cc0cc52631668985d8db22a;p=openembedded.git

merge of 5945a66a6847c21d25595376695c23f3971f6f8a
     and e544df2d6779a2a53f1c47a6d1e1961d875d17af
---

6c97f56d28872da36cc0cc52631668985d8db22a