From: David Karlstrom <daka@thg.se>
Date: Sat, 20 Aug 2005 14:53:35 +0000 (+0000)
Subject: merge of 31c249abc696ce980417cf47b06891a67f02e166
X-Git-Tag: Release-2010-05/1~9453^2~3867^2~1^2~2^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e01059f9f4306d853fd56596e55a91867836b3d;p=openembedded.git

merge of 31c249abc696ce980417cf47b06891a67f02e166
     and e951982319017716291e547c31cf1a75b2ccd676
---

6e01059f9f4306d853fd56596e55a91867836b3d