From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Jun 2007 00:36:26 +0000 (+0000)
Subject: merge of 'cdfb16fa120107504979a268988c8e742fb9ee27'
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~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d2310ec41595400fc1dd4c7c78e1d51101281c0;p=openembedded.git

Merge ... 'cdfb16fa120107504979a268988c8e742fb9ee27'
     and 'fa1c000d2eb11e81b0552935ffbdfcbf497dde8a'
---

8d2310ec41595400fc1dd4c7c78e1d51101281c0