From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 10 Jun 2007 23:09:20 +0000 (+0000)
Subject: merge of '3a6b01b01d62d5e60d197d35677578f6af34f76e'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~22^2~2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f786144b62ed5d3a285781d3323c8a53a882ca9;p=openembedded.git

Merge ... '3a6b01b01d62d5e60d197d35677578f6af34f76e'
     and '5ba12165d79b92a702fc82b1a0b9bc7af6b37511'
---

5f786144b62ed5d3a285781d3323c8a53a882ca9