From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 19 Nov 2005 10:48:16 +0000 (+0000)
Subject: merge of 7a60456e1148db739739d3d0147b828bffebf944
X-Git-Tag: Release-2010-05/1~9453^2~3053
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=658450fcbe53b6b9a3429f92cd160a86b995a799;p=openembedded.git

merge of 7a60456e1148db739739d3d0147b828bffebf944
     and 7afdee4aedea90fb1bd7b32d135cd76f2bcfb368
---

658450fcbe53b6b9a3429f92cd160a86b995a799