From: David Karlstrom <daka@thg.se>
Date: Sun, 21 Aug 2005 17:24:16 +0000 (+0000)
Subject: merge of 9ecdfad028b0756ef24d34ae5fcfb39a2f62a0fb
X-Git-Tag: Release-2010-05/1~9453^2~3849^2~5^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20e87349126957330957f58e05f24890fd01123a;p=openembedded.git

merge of 9ecdfad028b0756ef24d34ae5fcfb39a2f62a0fb
     and afbcaf9595662eb4d73b1df884babe912481d2a3
---

20e87349126957330957f58e05f24890fd01123a