From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 23 Jan 2008 15:30:47 +0000 (+0000)
Subject: merge of '58a64bc4f0e9295e4e68eaf15495ee2eb9e6fbd8'
X-Git-Tag: Release-2010-05/1~7841^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afb0f20bdd09cacf09e4757bb6a40cc14b8a7e91;p=openembedded.git

Merge ... '58a64bc4f0e9295e4e68eaf15495ee2eb9e6fbd8'
     and '72f985b233bd7f6a6cccf8ae78b46faac96fd50a'
---

afb0f20bdd09cacf09e4757bb6a40cc14b8a7e91