From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 12 Sep 2006 21:10:42 +0000 (+0000)
Subject: merge of 83d0e48aed0ad37c789536151c11fe1ee96e68c6
X-Git-Tag: Release-2010-05/1~9453^2~837
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f58bb1398ec45127536ade3ea969ac77fda8318;p=openembedded.git

merge of 83d0e48aed0ad37c789536151c11fe1ee96e68c6
     and e7d24f7f731de72cf1c6a2dd55f36590d951f3b4
---

2f58bb1398ec45127536ade3ea969ac77fda8318