From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 23 Jun 2006 23:15:59 +0000 (+0000)
Subject: merge of 236d70d96b3f9300bb6e751a5d3f3ea13f9a04db
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=051fd93bc33d08e08e2373149e198b65cb18d43d;p=openembedded.git

merge of 236d70d96b3f9300bb6e751a5d3f3ea13f9a04db
     and f4984d1bec6ce4b4b676ecf827227e24bfb4eab1
---

051fd93bc33d08e08e2373149e198b65cb18d43d