From: Cliff Brake <cbrake@bec-systems.com>
Date: Wed, 3 Jan 2007 12:51:20 +0000 (+0000)
Subject: merge of '1b97b6566e1ae9dd18335c287469a817078fbb10'
X-Git-Tag: Release-2010-05/1~9453^2~29^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba154f2b6f5ed3b829f8a8abb2ead45c5ad4f26b;p=openembedded.git

Merge ... '1b97b6566e1ae9dd18335c287469a817078fbb10'
     and '2f655855e9cd21f0db11577a04d65162273a4b1c'
---

ba154f2b6f5ed3b829f8a8abb2ead45c5ad4f26b