From: Koen Kooi <koen@openembedded.org>
Date: Fri, 3 Mar 2006 17:00:58 +0000 (+0000)
Subject: merge of 6e9e8adcb21fef25823c9f2d82e7207a517c308a
X-Git-Tag: Release-2010-05/1~9453^2~2295^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc93078f8d7e84148dbea397bcbeaeb2b26000a4;p=openembedded.git

merge of 6e9e8adcb21fef25823c9f2d82e7207a517c308a
     and 93aa2173d41c73ee5f9af3bc402117d7287055c2
---

dc93078f8d7e84148dbea397bcbeaeb2b26000a4