From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 30 Jun 2006 19:37:58 +0000 (+0000)
Subject: merge of 8285fffeea14ff0cd3878dcb884e0b5144db0c60
X-Git-Tag: Release-2010-05/1~9453^2~1393
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2670e8b9c2ddc45839d9bd2dfab24248b967cf27;p=openembedded.git

merge of 8285fffeea14ff0cd3878dcb884e0b5144db0c60
     and 84e5771fb218fada8d3043b91b28f8300a52248c
---

2670e8b9c2ddc45839d9bd2dfab24248b967cf27