From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 20 Jan 2006 19:09:46 +0000 (+0000)
Subject: merge of 82bcdbbeb00c95318d566c7433ccdc8ac512737e
X-Git-Tag: Release-2010-05/1~9453^2~2608^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab3a0aeab9d7530d182c83d631b4443d9105a028;p=openembedded.git

merge of 82bcdbbeb00c95318d566c7433ccdc8ac512737e
     and 83e188071b5f6287dbe396261e4ad3fead68a0d2
---

ab3a0aeab9d7530d182c83d631b4443d9105a028