From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 16 Oct 2006 13:54:51 +0000 (+0000)
Subject: merge of '9d164624a8276036f03513589d796c605fe94f26'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~156^2~1^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8e702ad4d191eeb23dc78bd2db3c2ed023aa00e;p=openembedded.git

Merge ... '9d164624a8276036f03513589d796c605fe94f26'
     and 'd278d85d5e8ebba0521212ff089ee6176a08a681'
---

f8e702ad4d191eeb23dc78bd2db3c2ed023aa00e