From: Matthias Hentges <oe@hentges.net>
Date: Thu, 25 May 2006 11:59:26 +0000 (+0000)
Subject: merge of 8fb156c1063985412f3d3d473d7c4641b7c1ce8c
X-Git-Tag: Release-2010-05/1~9453^2~1632
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62be5a5ffe0f30551c1e92edf56ddccc4056e421;p=openembedded.git

merge of 8fb156c1063985412f3d3d473d7c4641b7c1ce8c
     and b04511549df1568005f531875b06fcbdfb7ee3c2
---

62be5a5ffe0f30551c1e92edf56ddccc4056e421