From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 6 Jul 2005 09:31:04 +0000 (+0000)
Subject: merge of 2c175103edd16989707cafa26c364d4c836c78f1
X-Git-Tag: Release-2010-05/1~9453^2~4229
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1738183f0019463bed2a82a645ba44b7263fb6e;p=openembedded.git

merge of 2c175103edd16989707cafa26c364d4c836c78f1
     and 6ce955f2f98c52e7f840a56e77bc39b232bd4b16
---

b1738183f0019463bed2a82a645ba44b7263fb6e