From: Holger Freyther <zecke@selfish.org>
Date: Thu, 16 Feb 2006 13:40:52 +0000 (+0000)
Subject: merge of 71e92e1770bc5fc32e38bca7b672012a47870d1f
X-Git-Tag: Release-2010-05/1~9453^2~2306^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=126de7d34f47f149627c46be99771c52de105edb;p=openembedded.git

merge of 71e92e1770bc5fc32e38bca7b672012a47870d1f
     and c11d7470d1a10d77cc57dd2233dc262fb6fff077
---

126de7d34f47f149627c46be99771c52de105edb