From: Koen Kooi <koen@openembedded.org>
Date: Fri, 19 Sep 2008 13:10:24 +0000 (+0000)
Subject: merge of '32e3cb7e99864d52a06bdc489a128fc6d02960c2'
X-Git-Tag: Release-2010-05/1~6056
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eba76d729e4ac75360145f229c4cf8785e857278;p=openembedded.git

Merge ... '32e3cb7e99864d52a06bdc489a128fc6d02960c2'
     and '9f20eba616b60c443a76d8de23b3759590c868c8'
---

eba76d729e4ac75360145f229c4cf8785e857278