From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 13 Dec 2007 22:43:51 +0000 (+0000)
Subject: merge of '2dd66e01098fdefc97b79f2c26ae0b399f517579'
X-Git-Tag: Release-2010-05/1~8136^2~44^2^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7adf6ab5dd75cf9b85acddac1e955f4ab72344fb;p=openembedded.git

Merge ... '2dd66e01098fdefc97b79f2c26ae0b399f517579'
     and 'f4fae9004af31107f4f7bba2a4fae3dcb11bc1e5'
---

7adf6ab5dd75cf9b85acddac1e955f4ab72344fb