From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 23 May 2006 13:00:35 +0000 (+0000)
Subject: merge of aa208c78dc9ba6e2c8b7c157a2a98c6ea5f507fb
X-Git-Tag: Release-2010-05/1~9453^2~1642
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8a4d3b5d0cdd2db7949e9f04288596683ef4fce;p=openembedded.git

merge of aa208c78dc9ba6e2c8b7c157a2a98c6ea5f507fb
     and f87d9b990300072e37071e6934f7af60c67bb40a
---

b8a4d3b5d0cdd2db7949e9f04288596683ef4fce