From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 9 Mar 2007 12:44:34 +0000 (+0000)
Subject: merge of '5a015d1c49983568aacf29859d863463069aca15'
X-Git-Tag: Release-2010-05/1~8868^2~1121^2^2~11^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a95cf081fd9162acc0cd3ad5a41dd518e4be8c2b;p=openembedded.git

Merge ... '5a015d1c49983568aacf29859d863463069aca15'
     and 'd78faded4fa134ff4c66a3d2b9ed2dcf62dbfb43'
---

a95cf081fd9162acc0cd3ad5a41dd518e4be8c2b