From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 23 Nov 2007 16:49:20 +0000 (+0000)
Subject: merge of '0b6935355f7d83e008381e3bc46345a5f8c686d9'
X-Git-Tag: Release-2010-05/1~8302
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=342c4173bb403b9fdaa9984f4f70a0ace263b4a4;p=openembedded.git

Merge ... '0b6935355f7d83e008381e3bc46345a5f8c686d9'
     and 'e48283e1dd58b2449622e99ee8018852bac6e0fa'
---

342c4173bb403b9fdaa9984f4f70a0ace263b4a4