From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 8 Mar 2008 17:54:50 +0000 (+0000)
Subject: merge of '046a7c86c7f2f843861265ba5899d217db4dc308'
X-Git-Tag: Release-2010-05/1~7516^2~2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2e55dcd06368cca2754e0ce8aa9e70c486f452a;p=openembedded.git

Merge ... '046a7c86c7f2f843861265ba5899d217db4dc308'
     and '2a3c5fdda9cf1cb761839f7e9309dcdb782f1f06'
---

d2e55dcd06368cca2754e0ce8aa9e70c486f452a