From: Michael Krelin <hacker@klever.net>
Date: Sat, 7 Jul 2007 17:18:31 +0000 (+0000)
Subject: merge of '32f3152ef198ae19e34181438504621d6e5c0270'
X-Git-Tag: Release-2010-05/1~8868^2~189^2~3^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa22f18482ce0c7c0afe9dd4c0407a86ecad61dd;p=openembedded.git

Merge ... '32f3152ef198ae19e34181438504621d6e5c0270'
     and '7ec9615281babcb1bd33e3299ca47a3cd2e4c8f7'
---

fa22f18482ce0c7c0afe9dd4c0407a86ecad61dd