From: David Karlstrom <daka@thg.se>
Date: Sat, 20 Aug 2005 14:55:41 +0000 (+0000)
Subject: merge of 250cd456777a4f049b651042f91adad919b1c05c
X-Git-Tag: Release-2010-05/1~9453^2~3867^2~1^2~2^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dd224d85887d70de9f54254d01e0b59312e9740;p=openembedded.git

merge of 250cd456777a4f049b651042f91adad919b1c05c
     and a2acaaf484c0fd43ed4d97a2542d974cb56362d1
---

3dd224d85887d70de9f54254d01e0b59312e9740