From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 8 Feb 2006 21:11:03 +0000 (+0000)
Subject: merge of 18dd8cf21b475b0438065a81c795a331d4dd1076
X-Git-Tag: Release-2010-05/1~9453^2~2387^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bf510d4128ad91f1b100fc80e3f2893dc20f686;p=openembedded.git

merge of 18dd8cf21b475b0438065a81c795a331d4dd1076
     and 4a2edc2b9931c29b07ce96536e36250048aa6e97
---

5bf510d4128ad91f1b100fc80e3f2893dc20f686