From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 4 Jan 2007 11:14:48 +0000 (+0000)
Subject: merge of '5dac0e1b5f9f45a441a326fa1473ba5075ccaa72'
X-Git-Tag: Release-2010-05/1~9453^2~27^2~6^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=486e00ccba909a4d06d7fad616710523bb86188b;p=openembedded.git

Merge ... '5dac0e1b5f9f45a441a326fa1473ba5075ccaa72'
     and 'a3e33233c551ea93b6c29d959a2a0f5d905b97e5'
---

486e00ccba909a4d06d7fad616710523bb86188b