From: Holger Freyther <zecke@selfish.org>
Date: Fri, 28 Jul 2006 09:17:12 +0000 (+0000)
Subject: merge of '151f96332675f5008c225f4aa580dcaaea8f04f8'
X-Git-Tag: Release-2010-05/1~9453^2~1070^2~8^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=426e9988e8f1fba2a417fc05a46f280dc811ccd3;p=openembedded.git

Merge ... '151f96332675f5008c225f4aa580dcaaea8f04f8'
     and '89e38da8206b15620ba7c2bef11c31e2dda99dd8'
---

426e9988e8f1fba2a417fc05a46f280dc811ccd3