From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 20 Dec 2006 13:41:22 +0000 (+0000)
Subject: merge of '2601e7ef59afcc83010bc4a599716c775a867e2e'
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbbf08bd5428308ad377287748883996a773b1e7;p=openembedded.git

Merge ... '2601e7ef59afcc83010bc4a599716c775a867e2e'
     and '2cb095a37f96f3f076129401bcf32c8ad04a340f'
---

fbbf08bd5428308ad377287748883996a773b1e7