From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 13 Feb 2008 11:15:20 +0000 (+0000)
Subject: merge of '054216fcb27d4211cd8948d7407878afe1bbf15c'
X-Git-Tag: Release-2010-05/1~7686^2~3^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=784e9e1768bfef0341ec13b7d17b32d98dafaef3;p=openembedded.git

Merge ... '054216fcb27d4211cd8948d7407878afe1bbf15c'
     and 'f26d3059129388297f1542283ce17d100f8c8acc'
---

784e9e1768bfef0341ec13b7d17b32d98dafaef3