From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 30 May 2007 00:34:31 +0000 (+0000)
Subject: merge of '1a1187f126ec0876e00371f866cfd820bf62057e'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99^2^2^2~1^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a7fec7073346b0b70a397f49ad29a7f804a249d;p=openembedded.git

Merge ... '1a1187f126ec0876e00371f866cfd820bf62057e'
     and '8837110e3d0f6c9f2e4784ae55f531e27e3cd6c9'
---

9a7fec7073346b0b70a397f49ad29a7f804a249d