From: David Karlstrom <daka@thg.se>
Date: Sat, 20 Aug 2005 15:54:06 +0000 (+0000)
Subject: merge of 8d0e7138b03cf8a4a3b0aae2d6a5a3ffb089b9f4
X-Git-Tag: Release-2010-05/1~9453^2~3867^2~1^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87d3b1ad2dad434d9ab2124fb9c0ee997ecec246;p=openembedded.git

merge of 8d0e7138b03cf8a4a3b0aae2d6a5a3ffb089b9f4
     and f1214e1166c21425ad41b398e1fb3bba0decb696
---

87d3b1ad2dad434d9ab2124fb9c0ee997ecec246