From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 3 Nov 2006 00:04:44 +0000 (+0000)
Subject: merge of '5e83a11c1979d1a25e15d1870551427de8ffa53a'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~40
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f58de2d6d17707c69d6a3bbc88d52af0a29925fa;p=openembedded.git

Merge ... '5e83a11c1979d1a25e15d1870551427de8ffa53a'
     and '88193d154d85992850b54a623cbba5f64fbe4615'
---

f58de2d6d17707c69d6a3bbc88d52af0a29925fa