From: Koen Kooi <koen@openembedded.org>
Date: Sat, 22 Sep 2007 07:26:49 +0000 (+0000)
Subject: merge of '168c993c49f268b8a0f366d8ffd63a961512f7fe'
X-Git-Tag: Release-2010-05/1~8625^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b0058cc25ea97d548a6359d5316740f2c5411c;p=openembedded.git

Merge ... '168c993c49f268b8a0f366d8ffd63a961512f7fe'
     and 'ed2f6968f3a6025abbe5062431c947ea2d34b5aa'
---

e9b0058cc25ea97d548a6359d5316740f2c5411c