From: Matthias Hentges <oe@hentges.net>
Date: Tue, 21 Feb 2006 12:23:39 +0000 (+0000)
Subject: merge of c05500f989033c95b9140a0af0e80c12779ee62d
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~96^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=021e339c349f6a37357c942b2ad56c00ec4dfbb8;p=openembedded.git

merge of c05500f989033c95b9140a0af0e80c12779ee62d
     and d46341ca553d7906dd18e7869e24f37f7e7c1590
---

021e339c349f6a37357c942b2ad56c00ec4dfbb8