From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sat, 2 Dec 2006 18:02:59 +0000 (+0000)
Subject: merge of '5f8e2fb083d5b8b890fa66425a21fcce539d65ef'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=857a4b5ba548f5bb797d1dc2efb42fa38792109a;p=openembedded.git

Merge ... '5f8e2fb083d5b8b890fa66425a21fcce539d65ef'
     and '7aedd4ff460b16cce3273fd31ead110f66692fc8'
---

857a4b5ba548f5bb797d1dc2efb42fa38792109a