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

merge of 6cf672d4e400649f3cbee2deb0da6edbeb759b88
     and d4664c4ade4053d4a0c57bb5bc4e78b846e3dec7
---

0275e7a1c26e95e0208c7e8f920b091dd08d6d3e