From: Holger Freyther <zecke@selfish.org>
Date: Sat, 5 Aug 2006 15:55:25 +0000 (+0000)
Subject: merge of '61c6cd8658c99e2416e242b79cdff01967f01c94'
X-Git-Tag: Release-2010-05/1~9453^2~999^2~20^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=042fb6d5f34d3a35d0d0a900ec9e9b0edc3ddd1e;p=openembedded.git

Merge ... '61c6cd8658c99e2416e242b79cdff01967f01c94'
     and 'f2735ada47cf2da717d1f68b7c88a4d129f0e8b2'
---

042fb6d5f34d3a35d0d0a900ec9e9b0edc3ddd1e