From: David Karlstrom <daka@thg.se>
Date: Wed, 3 Aug 2005 07:29:11 +0000 (+0000)
Subject: merge of 0241e7bd233c727dc013a20bd6cbfadd4a2a04dc
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~27^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97e9c3d88d439b8c43683345320f02b35ec4be36;p=openembedded.git

merge of 0241e7bd233c727dc013a20bd6cbfadd4a2a04dc
     and 9b92b607ea4961e9ebb9ee801dfb76e3bf258ed4
---

97e9c3d88d439b8c43683345320f02b35ec4be36