From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 7 Oct 2005 16:59:31 +0000 (+0000)
Subject: merge of 417b6b1ab4151082a038c4eb1bc88276a46675b0
X-Git-Tag: Release-2010-05/1~9453^2~3319^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec4471204f98aea123a32d1b1c7f01c68f47bb90;p=openembedded.git

merge of 417b6b1ab4151082a038c4eb1bc88276a46675b0
     and d158643df91483ff93864d58c92e889b0050dea6
---

ec4471204f98aea123a32d1b1c7f01c68f47bb90