From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 21 Sep 2005 10:19:38 +0000 (+0000)
Subject: merge of 7d60c571444743e7ddfdd9c52895c6b38850a8e5
X-Git-Tag: Release-2010-05/1~9453^2~3474^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aa844cac6e6034826f9bf1b8fc59d49b7125599;p=openembedded.git

merge of 7d60c571444743e7ddfdd9c52895c6b38850a8e5
     and 9a585ac85d681727fb65515f8c7f6612395d0ffc
---

1aa844cac6e6034826f9bf1b8fc59d49b7125599