From: Holger Freyther <zecke@selfish.org>
Date: Sat, 9 Jul 2005 12:39:05 +0000 (+0000)
Subject: merge of 4bab829d6e0b67e537734ef4a2e79ef512e4e9eb
X-Git-Tag: Release-2010-05/1~9453^2~4213
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b99b87f0289fa7abefd743bad0a23d4636c0479;p=openembedded.git

merge of 4bab829d6e0b67e537734ef4a2e79ef512e4e9eb
     and fc5f4f47b13aa95efb2b9921fc70f00b5cd26ae2
---

2b99b87f0289fa7abefd743bad0a23d4636c0479