From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 14 Jun 2007 07:55:16 +0000 (+0000)
Subject: merge of '4174da17cc76d0fa9a74373c4588dcabac058e35'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b07c3ae41a7b222f7ef3588d0bd8f14b80ef12e;p=openembedded.git

Merge ... '4174da17cc76d0fa9a74373c4588dcabac058e35'
     and 'b3b0a8850deffddd2c3a43b7bc7c142279e70463'
---

3b07c3ae41a7b222f7ef3588d0bd8f14b80ef12e