From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 7 Jan 2006 22:00:25 +0000 (+0000)
Subject: merge of 0cca75bf60d8910a9f3746cfcf54fae56e50a758
X-Git-Tag: Release-2010-05/1~9453^2~2707^2^2~11^2^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99ae9abc58d3e9ddbcca446101d0dace838c464d;p=openembedded.git

merge of 0cca75bf60d8910a9f3746cfcf54fae56e50a758
     and 84cacf0306830aa7f116a84e41a65ab4e2d8a7b9
---

99ae9abc58d3e9ddbcca446101d0dace838c464d