From: Matthias Hentges <oe@hentges.net>
Date: Thu, 11 May 2006 17:08:01 +0000 (+0000)
Subject: merge of 6efbfec71e63ee2a821512e58cb523b4ead883d6
X-Git-Tag: Release-2010-05/1~9453^2~1718
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3df2dc0637af5f35a4a043edda91f89578e1c024;p=openembedded.git

merge of 6efbfec71e63ee2a821512e58cb523b4ead883d6
     and d357b0f02022987c9fa01fadcab872e091fede5e
---

3df2dc0637af5f35a4a043edda91f89578e1c024