From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 11 Apr 2006 10:37:45 +0000 (+0000)
Subject: merge of 830a2ca2c9484467078002caaef98f80db84c191
X-Git-Tag: Release-2010-05/1~9453^2~2075
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dbac5bc4465261136bca6e3b9b2c35ddab50174;p=openembedded.git

merge of 830a2ca2c9484467078002caaef98f80db84c191
     and a5073c2c09ef06e7875d4a30ddfdb0a9b8bd58f3
---

4dbac5bc4465261136bca6e3b9b2c35ddab50174