From: Justin Patrin <papercrane@gmail.com>
Date: Sun, 15 Jan 2006 05:45:44 +0000 (+0000)
Subject: merge of 87e4f0da031411c350745ff1cd9325a82c7c3cb9
X-Git-Tag: Release-2010-05/1~9453^2~2608^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47cde1bfb6658f5464862c4cf362fac5f5e90cda;p=openembedded.git

merge of 87e4f0da031411c350745ff1cd9325a82c7c3cb9
     and e08e5d284b9c3633dc77b46afcf0f14fd5cab232
---

47cde1bfb6658f5464862c4cf362fac5f5e90cda