From: Matthias Hentges <oe@hentges.net>
Date: Mon, 3 Jul 2006 15:21:59 +0000 (+0000)
Subject: merge of 1ab0b6390e66e13ae36640a9fd9b65f9a0bc1b7c
X-Git-Tag: Release-2010-05/1~9453^2~1355
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3d1dccaefd2a6f68c3c23bba12c40b1842a9bd;p=openembedded.git

merge of 1ab0b6390e66e13ae36640a9fd9b65f9a0bc1b7c
     and 224211bcb23937fa650395e98198e8b84c763c51
---

cb3d1dccaefd2a6f68c3c23bba12c40b1842a9bd