From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 9 Jan 2007 12:32:17 +0000 (+0000)
Subject: merge of '293e51d51d159e1203f6f75bb02b80e8adc041ab'
X-Git-Tag: Release-2010-05/1~9420^2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fca0304f86c05d73e8586701963e36c69acb634e;p=openembedded.git

Merge ... '293e51d51d159e1203f6f75bb02b80e8adc041ab'
     and '336c3826d3982a8a1f9b8569c023289204dd0092'
---

fca0304f86c05d73e8586701963e36c69acb634e