From: OpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Date: Fri, 18 Jan 2008 14:21:33 +0000 (+0000)
Subject: merge of 'a0f0a04325ed193844895cf9b74e8b1b48deac4e'
X-Git-Tag: Release-2010-05/1~7890
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=936f218c36509a98d9d587a7918f2a33d1441d91;p=openembedded.git

Merge ... 'a0f0a04325ed193844895cf9b74e8b1b48deac4e'
     and 'e55bf39595a78df12d17e4b80e9ed474ad5a467d'
---

936f218c36509a98d9d587a7918f2a33d1441d91