From: Matthias Hentges <oe@hentges.net>
Date: Fri, 22 Jul 2005 18:25:52 +0000 (+0000)
Subject: merge of bdb97a8488d4ea90ddba854e2c02a206b747fd3f
X-Git-Tag: Release-2010-05/1~9453^2~4086^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=698ac3fa0dd2ca20c8affcc63b77a3fd003aab26;p=openembedded.git

merge of bdb97a8488d4ea90ddba854e2c02a206b747fd3f
     and c01db26784f543ae5912fe2d58bb400f3e8d3f86
---

698ac3fa0dd2ca20c8affcc63b77a3fd003aab26