From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 21 Sep 2005 09:06:31 +0000 (+0000)
Subject: merge of 9bbf3b49428861667fd03d8e2eea47c7348e91bb
X-Git-Tag: Release-2010-05/1~9453^2~3474^2~3^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=188bfeb0e1b1cc4c505263b59bd8c56f83842efb;p=openembedded.git

merge of 9bbf3b49428861667fd03d8e2eea47c7348e91bb
     and 9cc938ac7d8bab2bd41cb94d8c11a81bfbf6dabe
---

188bfeb0e1b1cc4c505263b59bd8c56f83842efb