From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Fri, 16 Dec 2005 12:24:36 +0000 (+0000)
Subject: merge of 0606dcf3992ccdc92086d57afe0c18d2e7866ca8
X-Git-Tag: Release-2010-05/1~9453^2~2906
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdd4a70fa1090a8097fb48a583b43d93739d05a6;p=openembedded.git

merge of 0606dcf3992ccdc92086d57afe0c18d2e7866ca8
     and 2f99d3226152a1a31655c50ccc4bca080bac9e82
---

fdd4a70fa1090a8097fb48a583b43d93739d05a6