From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 30 Mar 2007 13:40:34 +0000 (+0000)
Subject: merge of '31ae6032f4387260877be7f6a21e6b2272aa21af'
X-Git-Tag: Release-2010-05/1~8868^2~901^2~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3306bbc1c0124b2fb32d1d03db86277d66e05e12;p=openembedded.git

Merge ... '31ae6032f4387260877be7f6a21e6b2272aa21af'
     and 'fb872b5eddde4be0bc44abec949610d89cadb232'
---

3306bbc1c0124b2fb32d1d03db86277d66e05e12