From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 9 Feb 2006 00:58:37 +0000 (+0000)
Subject: merge of d17f60969b9aa66d7e2a10b01b1b2712c739a936
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83de9cc7b6dcc7447f14d9361b37317297968047;p=openembedded.git

merge of d17f60969b9aa66d7e2a10b01b1b2712c739a936
     and f3b5ec0f8fb17f8309020cc990163b2a4440edff
---

83de9cc7b6dcc7447f14d9361b37317297968047