From: David Karlstrom <daka@thg.se>
Date: Sat, 30 Jul 2005 19:18:53 +0000 (+0000)
Subject: merge of aca49b567863b4486c3e93b6a74baee4e3679916
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~23
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22d73880c4233315af2b8c1459cd1e01d720648f;p=openembedded.git

merge of aca49b567863b4486c3e93b6a74baee4e3679916
     and f0e0882a2b8b4ba770bd84253b5b9d883303fac7
---

22d73880c4233315af2b8c1459cd1e01d720648f