From: Koen Kooi <koen@openembedded.org>
Date: Thu, 10 Aug 2006 16:17:24 +0000 (+0000)
Subject: merge of 'e383b4da996a2fc451decc374fb00f9c927e9ca1'
X-Git-Tag: Release-2010-05/1~9453^2~996^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3015ba72d7dbd9fec52fb653614f554c8f66d029;p=openembedded.git

Merge ... 'e383b4da996a2fc451decc374fb00f9c927e9ca1'
     and 'fdff4c7b074f0518fdc8379e6902fa4e4d984894'
---

3015ba72d7dbd9fec52fb653614f554c8f66d029