From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 12 Aug 2005 14:01:29 +0000 (+0000)
Subject: merge of 0ff64394ec8e55a962dae7598429db658db92ce8
X-Git-Tag: Release-2010-05/1~9453^2~3901^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df2f2bf4c05e30fa369fbf8cc3de0f2569208fc6;p=openembedded.git

merge of 0ff64394ec8e55a962dae7598429db658db92ce8
     and 7d7503a076b2aa004a780c9f24769124a939d7df
---

df2f2bf4c05e30fa369fbf8cc3de0f2569208fc6