From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 13 Aug 2007 23:54:12 +0000 (+0000)
Subject: merge of '701525ebf6131710f441a3072f8f1caed332cc46'
X-Git-Tag: Release-2010-05/1~8987
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1fa081ac75d80d75100baef63aa357c5a83d9b3;p=openembedded.git

Merge ... '701525ebf6131710f441a3072f8f1caed332cc46'
     and '866608b5715d308c7f889aa90017e6c734d22ec9'
---

f1fa081ac75d80d75100baef63aa357c5a83d9b3