From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 May 2008 17:14:02 +0000 (+0000)
Subject: merge of '8c0681c145743970130cbe62da92b45f76b3c4b5'
X-Git-Tag: Release-2010-05/1~6940
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1da46e43114e8fea06d3d08f9bd22ef3dd7dd895;p=openembedded.git

Merge ... '8c0681c145743970130cbe62da92b45f76b3c4b5'
     and 'b459044149ae9e0fc21221903548ff66c0427cef'
---

1da46e43114e8fea06d3d08f9bd22ef3dd7dd895