From: Robert Schuster <thebohemian@gmx.net>
Date: Wed, 19 Dec 2007 17:24:57 +0000 (+0000)
Subject: merge of '36dc1826480be70d657adcad4878a3f6f3e9092f'
X-Git-Tag: Release-2010-05/1~8122^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=642b1a18b2e3fbaeed7c505d29b3e1f2f5c3e5ce;p=openembedded.git

Merge ... '36dc1826480be70d657adcad4878a3f6f3e9092f'
     and '558c5b83f962e73a6166add223c6cb648a1fe2ab'
---

642b1a18b2e3fbaeed7c505d29b3e1f2f5c3e5ce