From: Koen Kooi <koen@openembedded.org>
Date: Fri, 14 Mar 2008 10:00:58 +0000 (+0000)
Subject: merge of '1baac115ff1ee3cfa594ac8bdb5a672342a18c6b'
X-Git-Tag: Release-2010-05/1~7488^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7cf564fa87a947ef5b5ff835a4d7c3ea40dc5f9;p=openembedded.git

Merge ... '1baac115ff1ee3cfa594ac8bdb5a672342a18c6b'
     and '3d41c4823011988b4e4758eb112e35cca8f29b7f'
---

c7cf564fa87a947ef5b5ff835a4d7c3ea40dc5f9