From: Matthias Hentges <oe@hentges.net>
Date: Sun, 21 May 2006 11:54:58 +0000 (+0000)
Subject: merge of 43210f598efbfe0448fd76adff3e7c54597c1238
X-Git-Tag: Release-2010-05/1~9453^2~1632^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc6202b190738b8a44174cbfff98a608d0ee8b45;p=openembedded.git

merge of 43210f598efbfe0448fd76adff3e7c54597c1238
     and 9f0cf5f918714fddd0ea186781b4d1a4ffc876bd
---

bc6202b190738b8a44174cbfff98a608d0ee8b45