From: Matthias Hentges <oe@hentges.net>
Date: Sat, 9 Jun 2007 21:54:47 +0000 (+0000)
Subject: merge of '7bc7d5c3532bb5efc024410e9d74cc23ebeb80c4'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~22^2~7^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc478760ffe73da7d2048c9d3a1f530544b4ebe1;p=openembedded.git

Merge ... '7bc7d5c3532bb5efc024410e9d74cc23ebeb80c4'
     and 'adf85b1ec40339e44983ef65acf414d9ad5ed6a4'
---

cc478760ffe73da7d2048c9d3a1f530544b4ebe1