From: Matthias Hentges <oe@hentges.net>
Date: Tue, 16 May 2006 01:01:26 +0000 (+0000)
Subject: merge of 599c09d67423118adcf4ed6ee44637260778ff74
X-Git-Tag: Release-2010-05/1~9453^2~1696
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f2f80d6aa1f837ecd64558f2f28d401ef6159fe;p=openembedded.git

merge of 599c09d67423118adcf4ed6ee44637260778ff74
     and ebb36a79d8c57f959145afb2c1f8685843041b9a
---

7f2f80d6aa1f837ecd64558f2f28d401ef6159fe