From: David Karlstrom <daka@thg.se>
Date: Wed, 3 Aug 2005 20:20:15 +0000 (+0000)
Subject: merge of 02948f94edc060110b60e3cb3e5b547d77f8c493
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~11^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0911d92c5c7838cbfd9dd77f1fcd16bcbfe2262;p=openembedded.git

merge of 02948f94edc060110b60e3cb3e5b547d77f8c493
     and a4218d106d35f16fd5c3c989fa4443eed9b62dde
---

b0911d92c5c7838cbfd9dd77f1fcd16bcbfe2262