From: Koen Kooi <koen@openembedded.org>
Date: Fri, 5 Sep 2008 12:07:10 +0000 (+0000)
Subject: merge of '78e920edfcc452a246ac6107c6733947f37cf081'
X-Git-Tag: Release-2010-05/1~6149^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a515e137db0b7136f3568186cc81dc321dc8d9bc;p=openembedded.git

Merge ... '78e920edfcc452a246ac6107c6733947f37cf081'
     and '7f3c3e5a83f5d237147a155da9148a52402e6937'
---

a515e137db0b7136f3568186cc81dc321dc8d9bc