From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 4 Jan 2007 15:57:13 +0000 (+0000)
Subject: merge of '2c8930a5e3dfc1e355f0dede8fde6b887e2d33de'
X-Git-Tag: Release-2010-05/1~9453^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c365f60cbcfd55c56a5a414cc3951773832da35e;p=openembedded.git

Merge ... '2c8930a5e3dfc1e355f0dede8fde6b887e2d33de'
     and 'cf2bb56e5f6bd283e65c7bf7c89c86e77dbd1fb0'
---

c365f60cbcfd55c56a5a414cc3951773832da35e