From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 19 Sep 2008 18:17:09 +0000 (+0000)
Subject: merge of '26da1e390ef5f5b958b6660965006568272d8f67'
X-Git-Tag: Release-2010-05/1~6051
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95b72ace096bafa94249fe009ebf600fa5171b75;p=openembedded.git

Merge ... '26da1e390ef5f5b958b6660965006568272d8f67'
     and '4e8627d0e74554ef7b775c83e08f37f0fa0921a1'
---

95b72ace096bafa94249fe009ebf600fa5171b75