From: Jonathan McDowell <noodles@earth.li>
Date: Tue, 8 Nov 2005 08:53:57 +0000 (+0000)
Subject: merge of 153be4736bf674fd8330fb369cf0a2a6ad382473
X-Git-Tag: Release-2010-05/1~9453^2~3113^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddfdc42ce0e9c07226c1a6390b03e5df4e731902;p=openembedded.git

merge of 153be4736bf674fd8330fb369cf0a2a6ad382473
     and 839ec3f42960c632240a938d522021359a9c136d
---

ddfdc42ce0e9c07226c1a6390b03e5df4e731902