From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 3 Jan 2008 14:25:02 +0000 (+0000)
Subject: merge of '49d63989ff625988d6bb90696a2abb7d3fc939bb'
X-Git-Tag: Release-2010-05/1~8032^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c21939e0df0a469763cee67fa7f8bf6f5099ccd9;p=openembedded.git

Merge ... '49d63989ff625988d6bb90696a2abb7d3fc939bb'
     and 'e470e7389a3efbef69e6eb562d9457d642b782a1'
---

c21939e0df0a469763cee67fa7f8bf6f5099ccd9