From: Koen Kooi <koen@openembedded.org>
Date: Fri, 16 May 2008 18:43:25 +0000 (+0000)
Subject: merge of '344877dac1be60d7f6d718179f6d015c047ad23e'
X-Git-Tag: Release-2010-05/1~6924
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcddbb9aaf2369a82a79b847b3be18ac820ce6e7;p=openembedded.git

Merge ... '344877dac1be60d7f6d718179f6d015c047ad23e'
     and 'e293c46f8f09b6eaa2999aeb6d575e1b84e6c7b4'
---

bcddbb9aaf2369a82a79b847b3be18ac820ce6e7