From: David Karlstrom <daka@thg.se>
Date: Sat, 30 Jul 2005 21:21:12 +0000 (+0000)
Subject: merge of 4032c1797996f6e321707d68ac4cb1989dae28cd
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~18^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecfa32c817b14fc49dfaca95ce09bd597237c8b8;p=openembedded.git

merge of 4032c1797996f6e321707d68ac4cb1989dae28cd
     and 674017eb4dff8527f93f526834e8c7e766e1f8a3
---

ecfa32c817b14fc49dfaca95ce09bd597237c8b8