From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 26 Oct 2006 15:58:21 +0000 (+0000)
Subject: merge of 292370be96ae823e50cc7a6150f75e83d93c1f58
X-Git-Tag: Release-2010-05/1~9453^2~573^2^2~8^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4752d54eeb4106685b1f3f4ed162fd135648d68e;p=openembedded.git

merge of 292370be96ae823e50cc7a6150f75e83d93c1f58
     and 73cdb33cdff28d6efe9fa72eb8012c492dc85d33
---

4752d54eeb4106685b1f3f4ed162fd135648d68e