From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 8 Jul 2008 12:26:40 +0000 (+0000)
Subject: merge of '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
X-Git-Tag: Release-2010-05/1~6546^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=401dc665fbf97899503cfdaa627bd8cb8e5c91ee;p=openembedded.git

Merge ... '560558ea6e0ea810e06402a8fd1e19d8c46e68c6'
     and 'b6fba5effb9e585b64323f16d607259748d6246f'
---

401dc665fbf97899503cfdaa627bd8cb8e5c91ee