From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 5 May 2008 17:32:02 +0000 (+0000)
Subject: merge of '2e9e31aaab7b3cb9ec8159571920f5085524e6c9'
X-Git-Tag: Release-2010-05/1~7019^2~3^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50468ef124004fb33fa463842b2042de16082159;p=openembedded.git

Merge ... '2e9e31aaab7b3cb9ec8159571920f5085524e6c9'
     and 'c4aee04fcf19f066a8cc1db58d3520728b043819'
---

50468ef124004fb33fa463842b2042de16082159