From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 7 May 2007 00:32:47 +0000 (+0000)
Subject: merge of 'cfa8d2cb144f036d07edfe4d470a48c730645c51'
X-Git-Tag: Release-2010-05/1~8868^2~517^2~2^2~1^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0af1290e79f6d482be943cadb292c1f3c44c3aab;p=openembedded.git

Merge ... 'cfa8d2cb144f036d07edfe4d470a48c730645c51'
     and 'd9305e9051bbce7371ad1d5da3fb95bb80bd399c'
---

0af1290e79f6d482be943cadb292c1f3c44c3aab