From: Koen Kooi <koen@openembedded.org>
Date: Fri, 22 Jun 2007 18:28:19 +0000 (+0000)
Subject: merge of '34310ed029b0ccbcd834f89fcea4e24c5d044ecc'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~28^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad3b62aa520cfd714e323317251e4dc48fa8785e;p=openembedded.git

Merge ... '34310ed029b0ccbcd834f89fcea4e24c5d044ecc'
     and 'e2e2ace957e66ed034ec39428d251e7ed9d0bb50'
---

ad3b62aa520cfd714e323317251e4dc48fa8785e