From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Jun 2007 11:23:28 +0000 (+0000)
Subject: merge of '9ab703d4c16ec3b563fe7a584c07a3035fb28ae8'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40f0721ba835b0dc61d3ecce54163237debd2b7e;p=openembedded.git

Merge ... '9ab703d4c16ec3b563fe7a584c07a3035fb28ae8'
     and 'c3874f683de044c6360f6915093c2b9dc30951aa'
---

40f0721ba835b0dc61d3ecce54163237debd2b7e