From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Jul 2005 17:15:57 +0000 (+0000)
Subject: merge of aa37801871f021c37b88d43fee5f45ca91367b15
X-Git-Tag: Release-2010-05/1~9453^2~4243^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=feb062ccc11221f40c0bc5f74b3907e736a61efd;p=openembedded.git

merge of aa37801871f021c37b88d43fee5f45ca91367b15
     and e3937d4018e11d782f3524b4d0dec996e597894d
---

feb062ccc11221f40c0bc5f74b3907e736a61efd