From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Jun 2008 06:59:15 +0000 (+0000)
Subject: merge of 'adb71bd42c308e5f50a18441883b2051173f9cd2'
X-Git-Tag: Release-2010-05/1~6757
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec6d55d9cff77c7626ae65a9a8307f046435973a;p=openembedded.git

Merge ... 'adb71bd42c308e5f50a18441883b2051173f9cd2'
     and 'd9f9c0225f99c1f7688e60a3a0c39a308c5fc36f'
---

ec6d55d9cff77c7626ae65a9a8307f046435973a