From: OpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Date: Mon, 16 Jun 2008 12:11:59 +0000 (+0000)
Subject: merge of '2d0e7ded96559d4c71de1153762dd0879fa16697'
X-Git-Tag: Release-2010-05/1~6675^2~14^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff137d12389e8c9b049fd50adcd34eb0f3c741dd;p=openembedded.git

Merge ... '2d0e7ded96559d4c71de1153762dd0879fa16697'
     and '3b0348e0f932d88b5a93caf068cae7af759a6339'
---

ff137d12389e8c9b049fd50adcd34eb0f3c741dd