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

merge of 4456e15f23db9a9f052dfcc702caeb50db1ee867
     and 6a067ebc597af5f7a5d22be5966896abfeea9182
---

545530dcaaeef0c96685387bef6ed823b2b515fe