From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 4 Sep 2005 10:20:03 +0000 (+0000)
Subject: merge of 123fcae9f3b7635a642fbb282e0ccbaa3101bd8d
X-Git-Tag: Release-2010-05/1~9453^2~3657
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c7ce46290f6ab80b7ae41841805c4fd631dd5cd;p=openembedded.git

merge of 123fcae9f3b7635a642fbb282e0ccbaa3101bd8d
     and f967ac0ac89db30dfae722cc9ed87e7fc46c136d
---

3c7ce46290f6ab80b7ae41841805c4fd631dd5cd