From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 4 Oct 2006 19:21:18 +0000 (+0000)
Subject: merge of '1eda19994e5c81f91c763811b4933f6a997fc501'
X-Git-Tag: Release-2010-05/1~9453^2~615^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a66b1c656b2e6284fd63dc910c2ce64d0fd0b549;p=openembedded.git

Merge ... '1eda19994e5c81f91c763811b4933f6a997fc501'
     and '22493c02a81dce48bd16714e4afc99389ea3fd30'
---

a66b1c656b2e6284fd63dc910c2ce64d0fd0b549