From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Jan 2007 17:02:12 +0000 (+0000)
Subject: merge of 1897dabec68161c37cd3543ac7f113e99557ec54
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edc830cc5f0c07ba413f1a878901a9a9441a4397;p=openembedded.git

merge of 1897dabec68161c37cd3543ac7f113e99557ec54
     and 708c7f78bd38429a1db285a3e8f82d315c91ac98
---

edc830cc5f0c07ba413f1a878901a9a9441a4397