From: Koen Kooi <koen@openembedded.org>
Date: Tue, 14 Oct 2008 10:38:55 +0000 (+0000)
Subject: merge of '3a2d3525d6188443c195ea295aa262c5e3dccb74'
X-Git-Tag: Release-2010-05/1~5822
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e8914c75a9b6f3074e9554620aa747b6f0cca6;p=openembedded.git

Merge ... '3a2d3525d6188443c195ea295aa262c5e3dccb74'
     and '40fbbc76fa2b3612027b83b97b4e703d113eaa3c'
---

d9e8914c75a9b6f3074e9554620aa747b6f0cca6