From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 7 Dec 2005 22:01:24 +0000 (+0000)
Subject: merge of 46a3490245fc8234a2a3cf3dea9bf7c79bb7c851
X-Git-Tag: Release-2010-05/1~9453^2~2968
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3d83dff4831a0b515357d6c91cd3246f66845bd;p=openembedded.git

merge of 46a3490245fc8234a2a3cf3dea9bf7c79bb7c851
     and 8183e5d9f7ede3a50afeceb17ef486ccbc630bec
---

b3d83dff4831a0b515357d6c91cd3246f66845bd