From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sat, 22 Oct 2005 18:39:19 +0000 (+0000)
Subject: merge of 0cf2c32074f58ddc96dacfcb6af604f6a34e0c0d
X-Git-Tag: Release-2010-05/1~9453^2~3218^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a563c31f0158eb3db2d9ed460cf45cd177a24fae;p=openembedded.git

merge of 0cf2c32074f58ddc96dacfcb6af604f6a34e0c0d
     and 56b3ed4e9341f55c95f894d1e48ffe56412f45fa
---

a563c31f0158eb3db2d9ed460cf45cd177a24fae