From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 18 Jul 2007 22:27:20 +0000 (+0000)
Subject: merge of '6e832d299c428f172ed4117bbcdcc0d79fac1124'
X-Git-Tag: Release-2010-05/1~8868^2~120^2~21^2~14^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5685fa7372375a49eb75404e8eca57442c7a605;p=openembedded.git

Merge ... '6e832d299c428f172ed4117bbcdcc0d79fac1124'
     and '8367169481d886ef2488e7436248e2746a2170fc'
---

b5685fa7372375a49eb75404e8eca57442c7a605