From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 1 Dec 2006 11:40:34 +0000 (+0000)
Subject: merge of '8827e908a98c3d0805a10db96eda80f5d5e29cd8'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~60
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d90c4bd302eddeff2cbf9fc089244b0d4e74ea3;p=openembedded.git

Merge ... '8827e908a98c3d0805a10db96eda80f5d5e29cd8'
     and 'fb24b0f3b51e2ab57fb4f0291af7e4c6e178b0da'
---

3d90c4bd302eddeff2cbf9fc089244b0d4e74ea3