From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 6 Apr 2007 22:57:31 +0000 (+0000)
Subject: merge of '158dc61862c10660d5b940391b1c809a551cf97c'
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^2^2^2^2~1^2^2^2~1^2^2^2^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56b53cb216ec59c26fb38887233bf9f479353e93;p=openembedded.git

Merge ... '158dc61862c10660d5b940391b1c809a551cf97c'
     and 'c6346a6de5d825ca4ddd2b7129cbcaeaf371c86a'
---

56b53cb216ec59c26fb38887233bf9f479353e93