From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 3 Jan 2008 15:24:40 +0000 (+0000)
Subject: merge of '0d7f35f44f5002f7df5f605bc373d3feecb8602d'
X-Git-Tag: Release-2010-05/1~8032^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23f2decbe62225e537aa4b8b72daf0f307340bbf;p=openembedded.git

Merge ... '0d7f35f44f5002f7df5f605bc373d3feecb8602d'
     and '40bac439643c75e92f89252f0b5dfe329b2b8119'
---

23f2decbe62225e537aa4b8b72daf0f307340bbf