From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 19 Dec 2006 10:47:29 +0000 (+0000)
Subject: merge of '5a54ff951084840540d73015604fc8e7141bcf97'
X-Git-Tag: Release-2010-05/1~9453^2~125^2~24^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13bbe27a5031c4df0f9cdabff5ace5046667254e;p=openembedded.git

Merge ... '5a54ff951084840540d73015604fc8e7141bcf97'
     and '7077b8b2641ba9a4fac75665eab0c373aa3c2d48'
---

13bbe27a5031c4df0f9cdabff5ace5046667254e