From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 1 Jan 2008 21:50:19 +0000 (+0000)
Subject: merge of '0d9bd56d97ada159199c80422a743fbaa437a818'
X-Git-Tag: Release-2010-05/1~8050^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f9e46740b16defbebb955752a317137121e0b85;p=openembedded.git

Merge ... '0d9bd56d97ada159199c80422a743fbaa437a818'
     and '7c47cd537d8cebaa3111aa836db24534a39b5ed9'
---

8f9e46740b16defbebb955752a317137121e0b85