From: Holger Freyther <zecke@selfish.org>
Date: Mon, 13 Mar 2006 23:28:18 +0000 (+0000)
Subject: merge of 284d424308c92240b4986482d28587433a310a21
X-Git-Tag: Release-2010-05/1~9453^2~2232^2~32^2~4^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7442d775307f881f35a86a8bb07326f3c81e6134;p=openembedded.git

merge of 284d424308c92240b4986482d28587433a310a21
     and 831d64598feef6ffc7121858519c98fc47d99b14
---

7442d775307f881f35a86a8bb07326f3c81e6134