From: Shane Volpe <shanevolpe@gmail.com>
Date: Sun, 18 May 2008 17:44:23 +0000 (+0000)
Subject: merge of '8c79c14e519c2da015b828d88899e0af791e9da9'
X-Git-Tag: Release-2010-05/1~6891^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79ff83371cd1be7c68d56b35e5679c4944ab3e54;p=openembedded.git

Merge ... '8c79c14e519c2da015b828d88899e0af791e9da9'
     and 'ac3b0371db0864fa58d78538a2999cb2d41479ff'
---

79ff83371cd1be7c68d56b35e5679c4944ab3e54