From: Matthias Hentges <oe@hentges.net>
Date: Mon, 20 Feb 2006 23:09:34 +0000 (+0000)
Subject: merge of 837efe3aeefce257370adc69dbcdf6e0b338c5c5
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~102
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57bea1c07deb3ab6748fd7340f30b0a97bc44ee4;p=openembedded.git

merge of 837efe3aeefce257370adc69dbcdf6e0b338c5c5
     and e5ea68d755d504fc5cf25c69893b45235adfeaa2
---

57bea1c07deb3ab6748fd7340f30b0a97bc44ee4