From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 30 Aug 2006 09:36:43 +0000 (+0000)
Subject: merge of '69bc603f5439800c81d9c68986a421da084e4efd'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~143^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9633f75d64fa1df42abd2415cee22695b556e00;p=openembedded.git

Merge ... '69bc603f5439800c81d9c68986a421da084e4efd'
     and 'def4216e697c6f92ad597789b7e520758364dae3'
---

f9633f75d64fa1df42abd2415cee22695b556e00