From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 3 Jan 2007 07:25:52 +0000 (+0000)
Subject: merge of '4a394f7770c7d370e3ad0bf4e77cb2288e195180'
X-Git-Tag: Release-2010-05/1~9453^2~4^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3289efbdab19b64283d2532ebee89f244234a23;p=openembedded.git

Merge ... '4a394f7770c7d370e3ad0bf4e77cb2288e195180'
     and 'c1c78bb1b00381defbcf8941f26b336eea75e8b3'
---

a3289efbdab19b64283d2532ebee89f244234a23