From: Holger Freyther <zecke@selfish.org>
Date: Sat, 27 May 2006 18:36:06 +0000 (+0000)
Subject: merge of 3a3ce2ba295b051169b23016abf8c2dc694c11f2
X-Git-Tag: Release-2010-05/1~9453^2~1580
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c913bc4ba7d572c5ab9ca85231fb9a82ad7efaa;p=openembedded.git

merge of 3a3ce2ba295b051169b23016abf8c2dc694c11f2
     and cd5dfac4524135d71f6f42fb7d1288b700ec5d38
---

3c913bc4ba7d572c5ab9ca85231fb9a82ad7efaa