From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Oct 2007 19:18:28 +0000 (+0000)
Subject: merge of '1071338fe9143d91f11215f627150ab1adc3a923'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~139^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8acf0bf20e7d1f4fb89de4df260fb7b4c83cb9d5;p=openembedded.git

Merge ... '1071338fe9143d91f11215f627150ab1adc3a923'
     and '2cffc57d52392fbeabd7156350a781b1a803493e'
---

8acf0bf20e7d1f4fb89de4df260fb7b4c83cb9d5