From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 2 Dec 2006 15:49:50 +0000 (+0000)
Subject: merge of '20f065690e4d1d9b912ff2b9ea74cb4ec5bfa58e'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aecca3c7561b165697abf319fe5cee27ba83c3cc;p=openembedded.git

Merge ... '20f065690e4d1d9b912ff2b9ea74cb4ec5bfa58e'
     and '54848140214b3d180243cd747004c124b89af382'
---

aecca3c7561b165697abf319fe5cee27ba83c3cc