From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 3 Sep 2005 12:09:42 +0000 (+0000)
Subject: merge of 8296491e9a6698946dcd0f0fe1002e56eab01cdc
X-Git-Tag: Release-2010-05/1~9453^2~3676
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc81ab31b7e881f3c4c6b0ddccc1688943272cfe;p=openembedded.git

merge of 8296491e9a6698946dcd0f0fe1002e56eab01cdc
     and 9fd3eb06066308e4db4d8943596c93a38f87f440
---

fc81ab31b7e881f3c4c6b0ddccc1688943272cfe