From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 31 Aug 2005 23:59:37 +0000 (+0000)
Subject: merge of 6cb03263ec6dc70d88e5694bd4793512b85564eb
X-Git-Tag: Release-2010-05/1~9453^2~3713^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28206871f49cf70657f136e73732694abbc606e1;p=openembedded.git

merge of 6cb03263ec6dc70d88e5694bd4793512b85564eb
     and f4c52b5ab6f084f42b43ac432882d7247319c14e
---

28206871f49cf70657f136e73732694abbc606e1