From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 18 Feb 2007 17:54:34 +0000 (+0000)
Subject: merge of '7ebd06970e2c9296f4bd61b23d65e46063c41150'
X-Git-Tag: Release-2010-05/1~9232^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe20002f8dd30c2b76f9ae62bb80f0dba968bbf6;p=openembedded.git

Merge ... '7ebd06970e2c9296f4bd61b23d65e46063c41150'
     and '98a9f60d428a74f8f8b42247cd8c7bcd9fc1e91a'
---

fe20002f8dd30c2b76f9ae62bb80f0dba968bbf6