From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 6 Feb 2007 08:45:07 +0000 (+0000)
Subject: merge of '874adfdd0660713eb95ed9ae86e0bd3fb95ec61a'
X-Git-Tag: Release-2010-05/1~9273^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a0d010cd1dd947f6d0e19b85f1d089ecb6eef16;p=openembedded.git

Merge ... '874adfdd0660713eb95ed9ae86e0bd3fb95ec61a'
     and '8ed317e67b9356de305928b5c3cfb03fa0cc9816'
---

0a0d010cd1dd947f6d0e19b85f1d089ecb6eef16