From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 6 May 2007 04:01:16 +0000 (+0000)
Subject: merge of '2df01515901ff96b1df8ddfe5a959db31e864f7a'
X-Git-Tag: Release-2010-05/1~8868^2~630^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=355557d69033685a666dda3ae874d4d79ea0f2e8;p=openembedded.git

Merge ... '2df01515901ff96b1df8ddfe5a959db31e864f7a'
     and '5a0c2498be96fb8ae42c90b19f42b7dd4761f996'
---

355557d69033685a666dda3ae874d4d79ea0f2e8