From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 3 Jul 2005 11:28:07 +0000 (+0000)
Subject: merge of 5d0bf12db458113fa06f91798e1362090e49ba8f
X-Git-Tag: Release-2010-05/1~9453^2~4243^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec9615803bf76a4f792e0492c73f9068c9f89b1d;p=openembedded.git

merge of 5d0bf12db458113fa06f91798e1362090e49ba8f
     and 9b0371bf5547d5dcea1bcd07f29bc1aceefcdd98
---

ec9615803bf76a4f792e0492c73f9068c9f89b1d