From: Matthias Hentges <oe@hentges.net>
Date: Sun, 12 Feb 2006 14:01:00 +0000 (+0000)
Subject: merge of 9d680ed94ee3622289ca2e365ea21a4fe475b650
X-Git-Tag: Release-2010-05/1~9453^2~2371^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d74a7e0914de459d712694d0e39dd6b436aed8d;p=openembedded.git

merge of 9d680ed94ee3622289ca2e365ea21a4fe475b650
     and a6f5fab8fef608fbada37e8e35857ada2aa931da
---

0d74a7e0914de459d712694d0e39dd6b436aed8d