From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 21 Mar 2007 11:46:01 +0000 (+0000)
Subject: merge of '5c7330ec43644078393961a8eb84648b758ec953'
X-Git-Tag: Release-2010-05/1~8868^2~1034^2~10^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=182ef785417c74d89da8b7e8dc92e8a83584fff8;p=openembedded.git

Merge ... '5c7330ec43644078393961a8eb84648b758ec953'
     and 'a2feb55d5703de5d580f9a019866a69764257a81'
---

182ef785417c74d89da8b7e8dc92e8a83584fff8