From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 24 Jul 2005 09:23:28 +0000 (+0000)
Subject: merge of 7674b5cefa1bffe23d1d22a95d2a3e5632799f08
X-Git-Tag: Release-2010-05/1~9453^2~4035
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e4507a78da1a3e593de26a10f683cf7549f7fd8;p=openembedded.git

merge of 7674b5cefa1bffe23d1d22a95d2a3e5632799f08
     and 7f183da4475115f7bfd62b35a7c733fe4fd59258
---

0e4507a78da1a3e593de26a10f683cf7549f7fd8