From: Koen Kooi <koen@openembedded.org>
Date: Wed, 8 Feb 2006 10:24:17 +0000 (+0000)
Subject: merge of 37906cae8de28e3888cce307d6dbdab279f57164
X-Git-Tag: Release-2010-05/1~9453^2~2405
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af00561e27a9d0c8038f2b1fd695e83e3b300ca1;p=openembedded.git

merge of 37906cae8de28e3888cce307d6dbdab279f57164
     and f076172bf11be4df22001e51898b11d9f9e2050d
---

af00561e27a9d0c8038f2b1fd695e83e3b300ca1