From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 22 Feb 2007 15:01:05 +0000 (+0000)
Subject: merge of 'cf825d08cde9f17188ff1a768443dd312658cb7d'
X-Git-Tag: Release-2010-05/1~9160^2~5^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3496eaadf50d896a6fd89fed51a4f6a50e508f6;p=openembedded.git

Merge ... 'cf825d08cde9f17188ff1a768443dd312658cb7d'
     and 'e00e94a7a53482bae8665a86de5dfc79645b03fb'
---

d3496eaadf50d896a6fd89fed51a4f6a50e508f6