From: Mika Laitio <lamikr@cc.jyu.fi>
Date: Tue, 6 Jun 2006 23:28:48 +0000 (+0000)
Subject: merge of 171f7917626b9f4ae8dbf894b68c59b96f170e80
X-Git-Tag: Release-2010-05/1~9453^2~1494^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9f308acea1c1258a69d8368735390f3f234e82d;p=openembedded.git

merge of 171f7917626b9f4ae8dbf894b68c59b96f170e80
     and 858f7c62c0df0be80b72c0b207ec39feb0025305
---

e9f308acea1c1258a69d8368735390f3f234e82d