From: Cliff Brake <cbrake@bec-systems.com>
Date: Wed, 4 Apr 2007 12:44:42 +0000 (+0000)
Subject: merge of '2c22bea4b2d6d4e0ad169b4d539960696bad4584'
X-Git-Tag: Release-2010-05/1~8868^2~780^2~12
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00cab400607c2179535dc6e7f704c2345120b45f;p=openembedded.git

Merge ... '2c22bea4b2d6d4e0ad169b4d539960696bad4584'
     and '5311d4b9d0be287a93d341e3dc0033e380cf3cb2'
---

00cab400607c2179535dc6e7f704c2345120b45f