From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Jun 2007 05:21:34 +0000 (+0000)
Subject: merge of '3fdd124395f61c532034fa01676c2780d9be8d40'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b109776007d875753814bfcd4ca9915e28a8af90;p=openembedded.git

Merge ... '3fdd124395f61c532034fa01676c2780d9be8d40'
     and '6e700926e2c6e45da6aea1653180f059932e25c5'
---

b109776007d875753814bfcd4ca9915e28a8af90