From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 15 Apr 2007 21:16:35 +0000 (+0000)
Subject: merge of '9c4b64659a16cc8199d699552bbcf5c4e5ca467d'
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~6^2^2~1^2~1^2^2~1^2^2^2^2~4^2~1^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45dd61b832ddaa4c52b40fa9997449b07d450711;p=openembedded.git

Merge ... '9c4b64659a16cc8199d699552bbcf5c4e5ca467d'
     and 'f9425e5aeadca35133e2a6491707c9e291d4a6fe'
---

45dd61b832ddaa4c52b40fa9997449b07d450711