From: Matthias Hentges <oe@hentges.net>
Date: Thu, 23 Feb 2006 12:34:37 +0000 (+0000)
Subject: merge of 5d00faa43da50d29b85f6526e4e7910ddc4c2894
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~68^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae019d8a5ac713a25768b76f4cb0af5c362b9cdf;p=openembedded.git

merge of 5d00faa43da50d29b85f6526e4e7910ddc4c2894
     and 5dc03a4f61ff65b8e7255e287dd9ead584c6c81f
---

ae019d8a5ac713a25768b76f4cb0af5c362b9cdf