From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Apr 2006 13:08:20 +0000 (+0000)
Subject: merge of 2ff27dc2432bb6df1bec19deafdff91dbb72f2c9
X-Git-Tag: Release-2010-05/1~9453^2~2045^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22174f65634f38287bedc42a35c2da6c5577a807;p=openembedded.git

merge of 2ff27dc2432bb6df1bec19deafdff91dbb72f2c9
     and 540e74d92c3ae03760fd0c13786f2dc1fcd4d838
---

22174f65634f38287bedc42a35c2da6c5577a807