From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 15 Apr 2007 07:30:03 +0000 (+0000)
Subject: merge of '4fa4f87979de4219c88fba63ac6ae11b020aeced'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9659925277186123c91ad0c20cd32534feb22962;p=openembedded.git

Merge ... '4fa4f87979de4219c88fba63ac6ae11b020aeced'
     and '7b2fee514f1bd349db33e0ceee663a9ebdd06afa'
---

9659925277186123c91ad0c20cd32534feb22962