From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 13 Feb 2007 19:48:39 +0000 (+0000)
Subject: merge of '53e411470094db53a09956f80b4ee9fe381960bd'
X-Git-Tag: Release-2010-05/1~9230^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7ad2da4354c1776cbf9d0eec173a9bfa584b4bf;p=openembedded.git

Merge ... '53e411470094db53a09956f80b4ee9fe381960bd'
     and 'c847baecc3966625d8ba8f5fa7b9f27ceb72b01f'
---

d7ad2da4354c1776cbf9d0eec173a9bfa584b4bf