From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 23 Apr 2007 14:26:05 +0000 (+0000)
Subject: merge of '4699a5e1d4242bae2ec7ffb11bfb87bd49e92de6'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~62
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8551c1c7552d496c7d74a80d833de23d6df1267;p=openembedded.git

Merge ... '4699a5e1d4242bae2ec7ffb11bfb87bd49e92de6'
     and '8b5068649e32f09f7094cee79f900f1394bc9d65'
---

a8551c1c7552d496c7d74a80d833de23d6df1267