From: Matthias Hentges <oe@hentges.net>
Date: Wed, 17 May 2006 08:10:04 +0000 (+0000)
Subject: merge of 58569a0e47bb26450c7e67d5aa0b20806e2b2a50
X-Git-Tag: Release-2010-05/1~9453^2~1692
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eadf46fddcf289beef3ea320677d969eb4a63fa;p=openembedded.git

merge of 58569a0e47bb26450c7e67d5aa0b20806e2b2a50
     and 5ae0815fd4186ce653535a78ab0e482e9a7c24f4
---

5eadf46fddcf289beef3ea320677d969eb4a63fa