From: David Karlstrom <daka@thg.se>
Date: Wed, 3 Aug 2005 16:47:05 +0000 (+0000)
Subject: merge of 6c249e86f20cab16da75a620e43f22520d6b1f7b
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~11^2~13
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ce88f37ba1862bec691b12ac984ee65b56fd7cc;p=openembedded.git

merge of 6c249e86f20cab16da75a620e43f22520d6b1f7b
     and b4b0bf82b4d08e6569292df80471f3ac9b750c0c
---

2ce88f37ba1862bec691b12ac984ee65b56fd7cc