From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 19 Mar 2006 01:37:05 +0000 (+0000)
Subject: merge of 80f6af3e8d9657bdfa59fa62d84fe03c09d93944
X-Git-Tag: Release-2010-05/1~9453^2~2217
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89d5937f9deb21493e356da573c432c2faab7371;p=openembedded.git

merge of 80f6af3e8d9657bdfa59fa62d84fe03c09d93944
     and ba687e58e5920f60f96f8753b6d3e6dba22c0dad
---

89d5937f9deb21493e356da573c432c2faab7371