From: Matthias Hentges <oe@hentges.net>
Date: Sun, 28 May 2006 18:55:19 +0000 (+0000)
Subject: merge of cd0b649e3d97651222b64dda95f33c9f25b6da1e
X-Git-Tag: Release-2010-05/1~9453^2~1567^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38da3ad2a494bd7d15de59ffea5a1909def1b39f;p=openembedded.git

merge of cd0b649e3d97651222b64dda95f33c9f25b6da1e
     and dd8feb404c362661db9a01792d93d148d4adf03b
---

38da3ad2a494bd7d15de59ffea5a1909def1b39f