From: Matthias Hentges <oe@hentges.net>
Date: Thu, 30 Mar 2006 16:48:13 +0000 (+0000)
Subject: merge of 4089b02c1852c1619a06b04106854c9297b0bcbc
X-Git-Tag: Release-2010-05/1~9453^2~2102^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b7dddd7bc2d21c17b99a3fae6ae83a495a704f4;p=openembedded.git

merge of 4089b02c1852c1619a06b04106854c9297b0bcbc
     and 9f344d76f36ce0e29d4c8846cf1ec7be90ab5ff8
---

3b7dddd7bc2d21c17b99a3fae6ae83a495a704f4