From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 6 Jan 2007 16:17:32 +0000 (+0000)
Subject: merge of '128ea1f546778b5d0b7f8f1c39f92f2a7d835406'
X-Git-Tag: Release-2010-05/1~9448^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbf57cbcfb334f50077c7a2810a1a8b50e97ca9f;p=openembedded.git

Merge ... '128ea1f546778b5d0b7f8f1c39f92f2a7d835406'
     and 'fab85738588f3cb90916df0d718c29821690cf44'
---

cbf57cbcfb334f50077c7a2810a1a8b50e97ca9f