From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 1 Dec 2007 14:20:17 +0000 (+0000)
Subject: merge of '44c54209ef42574b28e953dcdf33228f818c8da7'
X-Git-Tag: Release-2010-05/1~8242^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fe52e25cbd55826aa99a42f83ea934a47553318;p=openembedded.git

Merge ... '44c54209ef42574b28e953dcdf33228f818c8da7'
     and '7ae6a85e45951bf75ee4d7b23b7c8dd7e0be1000'
---

8fe52e25cbd55826aa99a42f83ea934a47553318