From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 26 Dec 2006 04:14:51 +0000 (+0000)
Subject: merge of '634b0214148424e84159707c395801ad41e82725'
X-Git-Tag: Release-2010-05/1~9453^2~94^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=241e95f564a9d52d64a1eba08296ce943ac67ba2;p=openembedded.git

Merge ... '634b0214148424e84159707c395801ad41e82725'
     and '97e37e0de018f0f2400e67f30a5073cb921b1d18'
---

241e95f564a9d52d64a1eba08296ce943ac67ba2