From: Koen Kooi <koen@openembedded.org>
Date: Mon, 4 Aug 2008 16:43:33 +0000 (+0000)
Subject: merge of '604e4566ff77ba4e877e134951341dca1fbf145e'
X-Git-Tag: Release-2010-05/1~6364
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=814bc470c250b650dbb145d44cc21a1511bad39f;p=openembedded.git

Merge ... '604e4566ff77ba4e877e134951341dca1fbf145e'
     and 'f2ceedc03b70c983dbbb20c9f461a7f40d0941e7'
---

814bc470c250b650dbb145d44cc21a1511bad39f