From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 3 Aug 2006 17:16:17 +0000 (+0000)
Subject: merge of 31d357b0ebed18d4bed9207bdfd1217f9cf35e9a
X-Git-Tag: Release-2010-05/1~9453^2~1016^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa08b5eb737a79621f97a103aef3fbcb28dc4053;p=openembedded.git

merge of 31d357b0ebed18d4bed9207bdfd1217f9cf35e9a
     and eb2bcd61169a0e93f50d3ebb9812a73ae81ac06c
---

fa08b5eb737a79621f97a103aef3fbcb28dc4053