From: Matthias Hentges <oe@hentges.net>
Date: Wed, 12 Apr 2006 11:08:28 +0000 (+0000)
Subject: merge of 18e53df44c1ad9ea6d82c04e90d3cd97285784a3
X-Git-Tag: Release-2010-05/1~9453^2~2065
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e831de681239949e34246f40dd04353a95f332e5;p=openembedded.git

merge of 18e53df44c1ad9ea6d82c04e90d3cd97285784a3
     and 48fc87c05059719962a1476c799e02ab0b8bab1a
---

e831de681239949e34246f40dd04353a95f332e5