From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 21 Jul 2007 13:13:14 +0000 (+0000)
Subject: merge of '68b677cc5ae237d521b127e852086eac5d000fd4'
X-Git-Tag: Release-2010-05/1~8868^2~120
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=275cf177e1dd0179d7c48dbf067115669b44b717;p=openembedded.git

Merge ... '68b677cc5ae237d521b127e852086eac5d000fd4'
     and 'e520909be2622e4bbdf3326729ffc870686d568e'
---

275cf177e1dd0179d7c48dbf067115669b44b717