From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Feb 2008 23:44:31 +0000 (+0000)
Subject: merge of '5b4101eded60b084a2015b66d47b04a99222e842'
X-Git-Tag: Release-2010-05/1~7649^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edf7f49a96cdc5c4160be3085d34309884f86133;p=openembedded.git

Merge ... '5b4101eded60b084a2015b66d47b04a99222e842'
     and 'c72441dc719a5903a8fdc705f309c086346249b0'
---

edf7f49a96cdc5c4160be3085d34309884f86133