From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 23 May 2007 10:13:19 +0000 (+0000)
Subject: merge of '6f648cc682c6e2f4f5d8c213ce6cefba7d0b43cb'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~179^2~15
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=866e3e95ab13237e4046da39b36ae39b6b209c0d;p=openembedded.git

Merge ... '6f648cc682c6e2f4f5d8c213ce6cefba7d0b43cb'
     and '84d1a27d53c034cb20fc7424c41218019cc8a33d'
---

866e3e95ab13237e4046da39b36ae39b6b209c0d