From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 19 Aug 2005 15:41:09 +0000 (+0000)
Subject: merge of 69f5e6634ad41e14c392c5aca06f4c4516ab4f21
X-Git-Tag: Release-2010-05/1~9453^2~3888
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bc0fa0024337ba8bec582084cabf6b8171e1aaf;p=openembedded.git

merge of 69f5e6634ad41e14c392c5aca06f4c4516ab4f21
     and e77aaa7cc80bddb255c4e859e17727dc070660df
---

5bc0fa0024337ba8bec582084cabf6b8171e1aaf