From: Matthias Hentges <oe@hentges.net>
Date: Fri, 22 Jul 2005 16:14:22 +0000 (+0000)
Subject: merge of 06b2731011911f8d2073caedb7598acabaa73120
X-Git-Tag: Release-2010-05/1~9453^2~4086^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb51833ac22189b48ab8fa4d148630014c66a7db;p=openembedded.git

merge of 06b2731011911f8d2073caedb7598acabaa73120
     and f765c50cac950ddf20df126682907000ec6f7101
---

eb51833ac22189b48ab8fa4d148630014c66a7db