From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 29 Dec 2006 19:37:19 +0000 (+0000)
Subject: merge of '2ca643ff7c613da29d4b700344b527b73f2000f6'
X-Git-Tag: Release-2010-05/1~9453^2~81^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcc1cbe50b07f48b61290adcb2c83e07cf1aa11f;p=openembedded.git

Merge ... '2ca643ff7c613da29d4b700344b527b73f2000f6'
     and '62e4d0ce49681c6de5b9819d261c14fb44919519'
---

dcc1cbe50b07f48b61290adcb2c83e07cf1aa11f