From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 3 Jan 2007 23:22:42 +0000 (+0000)
Subject: merge of '4b865f129d7c784106bb82861c16cc6330c629a9'
X-Git-Tag: Release-2010-05/1~9453^2~29^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91818574fb20e98aed69f4f4586e3f971e17f013;p=openembedded.git

Merge ... '4b865f129d7c784106bb82861c16cc6330c629a9'
     and '7e82eca3f8662bfb12dc49e93daed21b2aa8feeb'
---

91818574fb20e98aed69f4f4586e3f971e17f013