From: Koen Kooi <koen@openembedded.org>
Date: Thu, 20 Mar 2008 12:34:27 +0000 (+0000)
Subject: merge of '3b3bdcaa9ad2328f02f412cfd58e88c216486d47'
X-Git-Tag: Release-2010-05/1~7316
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce09099588da37235a4652f4014794b4bde51188;p=openembedded.git

Merge ... '3b3bdcaa9ad2328f02f412cfd58e88c216486d47'
     and '808c0f3bcbe784d70daee61bfb6f464d0072147f'
---

ce09099588da37235a4652f4014794b4bde51188