From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 30 Apr 2007 04:12:09 +0000 (+0000)
Subject: merge of '0e85d248181cfdf704931e925058cea1824151c2'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~3^2~13
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8ffd6dc2793e9cab761ad7c9c6b1bdd8425a28b;p=openembedded.git

Merge ... '0e85d248181cfdf704931e925058cea1824151c2'
     and '4ae75f1e55a112909b2988f967576647e8b6ed03'
---

c8ffd6dc2793e9cab761ad7c9c6b1bdd8425a28b