From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 18 May 2006 23:41:17 +0000 (+0000)
Subject: merge of 11bb54e0cf52d0c5a23e20076d3797d35cd2e8e7
X-Git-Tag: Release-2010-05/1~9453^2~1679
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e757f845ebc5d903035b518a6a4a58265b03ba06;p=openembedded.git

merge of 11bb54e0cf52d0c5a23e20076d3797d35cd2e8e7
     and 8d2aa23a304d9d1a81851b96ec6e5cee74f24fe7
---

e757f845ebc5d903035b518a6a4a58265b03ba06