From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 29 Feb 2008 17:05:05 +0000 (+0000)
Subject: merge of '1c40da9a692a6c3985b5d6fe8eb5b28dd7738c66'
X-Git-Tag: Release-2010-05/1~7572^2~25^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=063cf4befbbdef2a8f124eff35d07f43352ce241;p=openembedded.git

Merge ... '1c40da9a692a6c3985b5d6fe8eb5b28dd7738c66'
     and '295199ba5efc8ddca9453992b8304f356f385efd'
---

063cf4befbbdef2a8f124eff35d07f43352ce241