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

merge of 42d69359113ca4019c6288abe81bcb0e233a958a
     and 6ae384bbffeb51d8f91602afdfe7f88512e52854
---

b17d0ea38e2275edb6c5b6b36940e406f5661562