From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 24 Oct 2007 13:10:40 +0000 (+0000)
Subject: merge of '4681b04a3d2d7f7f51e4bc94ec5d6582ea3ae5e0'
X-Git-Tag: Release-2010-05/1~8454^2~154^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ee5b6f059771aaa6f4f88a4b4e02f314177b93f;p=openembedded.git

Merge ... '4681b04a3d2d7f7f51e4bc94ec5d6582ea3ae5e0'
     and '5f9b157c1e6b280d0ed91fc354403a3e900f7f8c'
---

5ee5b6f059771aaa6f4f88a4b4e02f314177b93f