From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 4 Jun 2007 13:22:58 +0000 (+0000)
Subject: merge of '48b3ebe818c6d71c00ae88870e198d7a6aaab977'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~78^2~19^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea1474fe9f594fd60befec842774c13ee96a2931;p=openembedded.git

Merge ... '48b3ebe818c6d71c00ae88870e198d7a6aaab977'
     and '9601d0f2fa6ac50e61ab50e4be9e17b571aad3f0'
---

ea1474fe9f594fd60befec842774c13ee96a2931