From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sat, 6 Jan 2007 23:29:54 +0000 (+0000)
Subject: merge of '4326959c5e60e2f30639de951de06bf46a10e335'
X-Git-Tag: Release-2010-05/1~9435^2~14^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d24eea31873116a6f9095417d2ebd30f1a30b14a;p=openembedded.git

Merge ... '4326959c5e60e2f30639de951de06bf46a10e335'
     and 'e40db82fe5785a6b7427f050901caa4bf1fc691f'
---

d24eea31873116a6f9095417d2ebd30f1a30b14a