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

merge of 0c1502175a502035993013e4873d3bc42e40894b
     and b7f772c18cf37048831c49f4bf9ae001545b201a
---

90f867c3f2e0824cac15e5b38d9208116d4209d5