From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 18 Jan 2006 17:07:05 +0000 (+0000)
Subject: merge of 1323e1df6038dca4973ee3bea9b6d558e7ce8fba
X-Git-Tag: Release-2010-05/1~9453^2~2608^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc9ee48f37e5ccbf2b7220911c270baa7bcd170;p=openembedded.git

merge of 1323e1df6038dca4973ee3bea9b6d558e7ce8fba
     and 72f8be28da1900bbf98ed7cc1fa244d3cd750692
---

2dc9ee48f37e5ccbf2b7220911c270baa7bcd170