From: Robert Schuster <thebohemian@gmx.net>
Date: Mon, 14 Jan 2008 07:36:28 +0000 (+0000)
Subject: merge of '2e4f188aff9f2db155896f2fc0669c515d2d86c3'
X-Git-Tag: Release-2010-05/1~7890^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1bf29d18be92745af49b2bfc1f3e78222d99202;p=openembedded.git

Merge ... '2e4f188aff9f2db155896f2fc0669c515d2d86c3'
     and 'ba76f4856806d81e983ec7db3a011d59a30abf15'
---

f1bf29d18be92745af49b2bfc1f3e78222d99202