From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 18 Jun 2007 14:13:49 +0000 (+0000)
Subject: merge of '155b946e1f6b7b62c440a6a3287064abab85ba61'
X-Git-Tag: Release-2010-05/1~8868^2~328^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a724cdbbdb56f7597daf0b8f72694398cbbb2433;p=openembedded.git

Merge ... '155b946e1f6b7b62c440a6a3287064abab85ba61'
     and '9156f7c12e244efcb93a5c9a0bc98ca6c3bfd786'
---

a724cdbbdb56f7597daf0b8f72694398cbbb2433