From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sat, 10 Jun 2006 14:29:55 +0000 (+0000)
Subject: merge of 12b4da6c57d22b540df4a906937d3c7d4fa403fc
X-Git-Tag: Release-2010-05/1~9453^2~1470
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a0ca80aaec6fa0ef055430a383a27369a24ff3e;p=openembedded.git

merge of 12b4da6c57d22b540df4a906937d3c7d4fa403fc
     and 9d41fcc4eba0eedc1fb8f754b632607ef08b3b96
---

7a0ca80aaec6fa0ef055430a383a27369a24ff3e