From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 21 Oct 2006 11:03:47 +0000 (+0000)
Subject: merge of 09016de82e8089016031f1df831bdc386449eec6
X-Git-Tag: Release-2010-05/1~9453^2~567^2~56^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a3ba22fdc53b371bd326dfb71e0db3d762933ae;p=openembedded.git

merge of 09016de82e8089016031f1df831bdc386449eec6
     and 4a8ed832e405a639214a80e4fadd5935c6ce3a8b
---

7a3ba22fdc53b371bd326dfb71e0db3d762933ae