From: Koen Kooi <koen@openembedded.org>
Date: Thu, 25 Sep 2008 18:58:21 +0000 (+0000)
Subject: merge of 'a3ceb2efe11ba0ea4109c98e325782ecb5291f36'
X-Git-Tag: Release-2010-05/1~5944
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e105788b0a726ba747a8e9b4b9701f3fc702cab6;p=openembedded.git

Merge ... 'a3ceb2efe11ba0ea4109c98e325782ecb5291f36'
     and 'e474c45d11742eae32d0f0be8f321dd5a162f101'
---

e105788b0a726ba747a8e9b4b9701f3fc702cab6