From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 12 Jun 2007 09:21:58 +0000 (+0000)
Subject: merge of '02e9149a64fb51811fbc732f21698b412dadb41b'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0aa8a096522105986d145c2275a30bb7aa7c960;p=openembedded.git

Merge ... '02e9149a64fb51811fbc732f21698b412dadb41b'
     and 'd6d4199be1379dc951fdff8d42e70b1f30a839de'
---

a0aa8a096522105986d145c2275a30bb7aa7c960