From: Cliff Brake <cbrake@bec-systems.com>
Date: Wed, 3 Oct 2007 17:08:10 +0000 (+0000)
Subject: merge of '4ea5a9aef34545de02877a14b307a17a78e03939'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4fe3fc9e87bf6c26b23304434187548439b5ebf;p=openembedded.git

Merge ... '4ea5a9aef34545de02877a14b307a17a78e03939'
     and '886aada8adfc803f178de9d934a313ed503451e9'
---

b4fe3fc9e87bf6c26b23304434187548439b5ebf