From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 1 Sep 2005 17:46:39 +0000 (+0000)
Subject: merge of 29134267458b518b87fa720d106c0188db1b6131
X-Git-Tag: Release-2010-05/1~9453^2~3678^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a06baa77957b94afd763e2f2881e03baf9b7cfcc;p=openembedded.git

merge of 29134267458b518b87fa720d106c0188db1b6131
     and 296ac2a5b3ca43f1af1caec04d2643a3970aecef
---

a06baa77957b94afd763e2f2881e03baf9b7cfcc