From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 12 Feb 2007 06:16:39 +0000 (+0000)
Subject: merge of '879c2e35f17da4b01ea93a7d8a286583b9eec1f6'
X-Git-Tag: Release-2010-05/1~9230^2~78
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61cd1b840978cd8e3afdb1c643557d5b1b9a4a98;p=openembedded.git

Merge ... '879c2e35f17da4b01ea93a7d8a286583b9eec1f6'
     and 'bae5b516fbb7c4ed7939b4dbb39c62866ef76d98'
---

61cd1b840978cd8e3afdb1c643557d5b1b9a4a98