From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 18 Jan 2006 15:38:36 +0000 (+0000)
Subject: merge of 24bf9da058274d3f063eefc91fd48d60cb1b6e0f
X-Git-Tag: Release-2010-05/1~9453^2~2628
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a3c0e80ef889e31d0a09530ba9e6877b75f1965;p=openembedded.git

merge of 24bf9da058274d3f063eefc91fd48d60cb1b6e0f
     and 7ec5f433ed2baee7bf3ff7b6f5e7bcc764aba699
---

4a3c0e80ef889e31d0a09530ba9e6877b75f1965