From: Koen Kooi <koen@openembedded.org>
Date: Sat, 16 Aug 2008 13:16:22 +0000 (+0000)
Subject: merge of '1381c99b5b235453ffd6d1e9c2eaeae4f080910b'
X-Git-Tag: Release-2010-05/1~6317^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f83ee8a351204c3de49dd2260263b184e096efe;p=openembedded.git

Merge ... '1381c99b5b235453ffd6d1e9c2eaeae4f080910b'
     and 'dbeff9227117d6552a46cabd79dc42643b6feebe'
---

5f83ee8a351204c3de49dd2260263b184e096efe