From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 9 Feb 2006 20:00:25 +0000 (+0000)
Subject: merge of dc7030746547ed09bdd941871c775b044c145143
X-Git-Tag: Release-2010-05/1~9453^2~2375
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4b4ff9addf60fb438632b7cd83441bd14d41224;p=openembedded.git

merge of dc7030746547ed09bdd941871c775b044c145143
     and f7940d7b4ac1dca8c38ef92949c3d012d70c9202
---

c4b4ff9addf60fb438632b7cd83441bd14d41224