From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 14 Feb 2006 16:56:31 +0000 (+0000)
Subject: merge of c70cc7660d061a9f9bb0fa1790b31bff0a914bc4
X-Git-Tag: Release-2010-05/1~9453^2~2359
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a34dbb592a74cd21ac2dd3fed42c7abd1c6c8200;p=openembedded.git

merge of c70cc7660d061a9f9bb0fa1790b31bff0a914bc4
     and e28b96e88f2e89ccaf7f4ba8e1a7f267883264e2
---

a34dbb592a74cd21ac2dd3fed42c7abd1c6c8200