From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 5 Feb 2006 16:37:20 +0000 (+0000)
Subject: merge of 1425776b25f87ca80f269f6305acef37ac3954ee
X-Git-Tag: Release-2010-05/1~9453^2~2442
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e76b792b9b258b000e3d82a4f47ea30d703685f9;p=openembedded.git

merge of 1425776b25f87ca80f269f6305acef37ac3954ee
     and f7d38069884135ea97e68eb9c203471935a6c3bf
---

e76b792b9b258b000e3d82a4f47ea30d703685f9