From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Jun 2008 18:38:48 +0000 (+0000)
Subject: merge of 'aac87a2141ed5dcc6cf1e3015a21d15463f3d048'
X-Git-Tag: Release-2010-05/1~6714^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2ecee68b3cf7a30ffb34756dbaa888e76a36fe9;p=openembedded.git

Merge ... 'aac87a2141ed5dcc6cf1e3015a21d15463f3d048'
     and 'c407c3e3af9b704a138bada2e0b7c565f8c293be'
---

c2ecee68b3cf7a30ffb34756dbaa888e76a36fe9