From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 9 Jul 2005 12:25:15 +0000 (+0000)
Subject: merge of 0e0901aeb2df666b7ef411c84571c64d8648f2f7
X-Git-Tag: Release-2010-05/1~9453^2~4213^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=569a89e69a417e2d8efe690b41a3968dbc690f02;p=openembedded.git

merge of 0e0901aeb2df666b7ef411c84571c64d8648f2f7
     and 37b3bd1d7cf4c3ff2c0e00c6bd7a87d690fc63d5
---

569a89e69a417e2d8efe690b41a3968dbc690f02