From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 14 Feb 2007 09:21:54 +0000 (+0000)
Subject: merge of 'b4e2c715e288ee539982fb926cb04f251d14ddcb'
X-Git-Tag: Release-2010-05/1~9230^2~55
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fa0ed3abc792d3dfbff603e0a7de254c36a488a;p=openembedded.git

Merge ... 'b4e2c715e288ee539982fb926cb04f251d14ddcb'
     and 'c3e49db4e23d7e4c30cca6944348c6c969afed7e'
---

0fa0ed3abc792d3dfbff603e0a7de254c36a488a