From: Holger Freyther <zecke@selfish.org>
Date: Tue, 8 Jan 2008 08:56:06 +0000 (+0000)
Subject: merge of '4758ca456d2363e1b00659c33da6c72ea4ac3074'
X-Git-Tag: Release-2010-05/1~7987
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=130c765e5e66d957ad943b91c9b6ad77306ba310;p=openembedded.git

Merge ... '4758ca456d2363e1b00659c33da6c72ea4ac3074'
     and 'e2c29cfbd284f015d3c4165234bbaf65c184d38d'
---

130c765e5e66d957ad943b91c9b6ad77306ba310