From: Koen Kooi <koen@openembedded.org>
Date: Fri, 24 Feb 2006 00:11:18 +0000 (+0000)
Subject: merge of 23fbf27774beb8da3d4bc3672a8415bfd24eb369
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~62
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e4a8f3e8c58a591970c7abddfc549e1928850c5;p=openembedded.git

merge of 23fbf27774beb8da3d4bc3672a8415bfd24eb369
     and e36ab3ae9c4e81b92e9a4b650a37af9a6a4174cf
---

7e4a8f3e8c58a591970c7abddfc549e1928850c5