From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 15 Oct 2006 14:42:29 +0000 (+0000)
Subject: merge of '7484bb8b957706d9249511a6a73b62f70db94929'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~162^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9209ce1af2831989d30ada8855bef83096c264e;p=openembedded.git

Merge ... '7484bb8b957706d9249511a6a73b62f70db94929'
     and 'cd494fdef6a7adeea4481f5aee353408cbfaf6f4'
---

e9209ce1af2831989d30ada8855bef83096c264e