From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 15 Feb 2007 04:40:07 +0000 (+0000)
Subject: merge of '3da5174282c3cc65d9982b13c8d2c63c267fddb0'
X-Git-Tag: Release-2010-05/1~9230^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c34cbde492b6c7720a5a315f2d98c3240f7055b8;p=openembedded.git

Merge ... '3da5174282c3cc65d9982b13c8d2c63c267fddb0'
     and '3e3164bc6ee6bcdbe9edc5dd9cd872fbc441cb37'
---

c34cbde492b6c7720a5a315f2d98c3240f7055b8