From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 16 Feb 2008 16:23:55 +0000 (+0000)
Subject: merge of '288800330cbc2faa2cdc0823b0016b858b6bee68'
X-Git-Tag: Release-2010-05/1~7669
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1c3aa4892bfe913d837781b4078a0f63def42b4;p=openembedded.git

Merge ... '288800330cbc2faa2cdc0823b0016b858b6bee68'
     and '6fbaa4dcc3640605ad76e93bbea2d08d823badbb'
---

c1c3aa4892bfe913d837781b4078a0f63def42b4