From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 10 Feb 2006 15:46:48 +0000 (+0000)
Subject: merge of 924ef15fba1f0235d0a67fd6a565e0da0f09389b
X-Git-Tag: Release-2010-05/1~9453^2~2371^2~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92abf98c2795a7243f202a250071929d5f4576ed;p=openembedded.git

merge of 924ef15fba1f0235d0a67fd6a565e0da0f09389b
     and f54776e08ef20ddb388681d53fa66a089ea326c6
---

92abf98c2795a7243f202a250071929d5f4576ed