From: Koen Kooi <koen@openembedded.org>
Date: Wed, 3 Sep 2008 12:45:31 +0000 (+0000)
Subject: merge of '1044732b8a88225ade87ce8064bd97dee00124ac'
X-Git-Tag: Release-2010-05/1~6170^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a15ed9ffce6d23ff06fcea5712694a778680c245;p=openembedded.git

Merge ... '1044732b8a88225ade87ce8064bd97dee00124ac'
     and '462295240b0a06ab1c367eb883ec218b4313bf89'
---

a15ed9ffce6d23ff06fcea5712694a778680c245