From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 23 Apr 2006 18:55:53 +0000 (+0000)
Subject: merge of e54d3f9c3cb5f2e740cd272a75c02eb49d140803
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17e1e0b1cf0654047134447e8772e381f6793606;p=openembedded.git

merge of e54d3f9c3cb5f2e740cd272a75c02eb49d140803
     and edb2b19eb6adbfa6e9319d29bed8c5ca6eedfd06
---

17e1e0b1cf0654047134447e8772e381f6793606