From: Matthias Hentges <oe@hentges.net>
Date: Sun, 23 Apr 2006 15:08:29 +0000 (+0000)
Subject: merge of 69d638b1c6e39bce739575e34e87d6fbc5e3b092
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~30^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bdb9dba1ae820afc40494807a4a1d19ca707b03;p=openembedded.git

merge of 69d638b1c6e39bce739575e34e87d6fbc5e3b092
     and d6d71105ea3c3b1274c6490f7ef981c3dd519f13
---

9bdb9dba1ae820afc40494807a4a1d19ca707b03