From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 10 Jan 2008 16:52:03 +0000 (+0000)
Subject: merge of '3a70542f110b6c428973d43745b25017469e203f'
X-Git-Tag: Release-2010-05/1~7973^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e8411a730dbfa42b70ac583e14f64bd0465f2a3;p=openembedded.git

Merge ... '3a70542f110b6c428973d43745b25017469e203f'
     and '63b3be114577f06e728c111b2fda61626ac3faaa'
---

7e8411a730dbfa42b70ac583e14f64bd0465f2a3