From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 3 Jan 2008 13:51:35 +0000 (+0000)
Subject: merge of '42ff173cbe3d22d33fbc21116ae54424b99451c8'
X-Git-Tag: Release-2010-05/1~8032^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93f4e05b6bd5a0140aaf827e9626bf42582437bf;p=openembedded.git

Merge ... '42ff173cbe3d22d33fbc21116ae54424b99451c8'
     and '75652b38a37c44ad34823f4fc6e67b212f2d6ec2'
---

93f4e05b6bd5a0140aaf827e9626bf42582437bf