From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 8 Feb 2006 16:00:28 +0000 (+0000)
Subject: merge of 7ba73700ed732b698e688443c1f964454f76f1e8
X-Git-Tag: Release-2010-05/1~9453^2~2400
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=863ed698204f4bf49f3ae654588c6488aa4b625e;p=openembedded.git

merge of 7ba73700ed732b698e688443c1f964454f76f1e8
     and e1e48e54eacd0f943b35dcc20e6b52674bcd69f9
---

863ed698204f4bf49f3ae654588c6488aa4b625e