From: Shane Volpe <shanevolpe@gmail.com>
Date: Tue, 19 Aug 2008 16:33:40 +0000 (+0000)
Subject: merge of '5a1eeba70ddedb225afa7bcf6a948e3d1e376069'
X-Git-Tag: Release-2010-05/1~6318
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae09040e845e88874bfce7613ae34a6ae183df7f;p=openembedded.git

Merge ... '5a1eeba70ddedb225afa7bcf6a948e3d1e376069'
     and '73007fe3d4a6a4798e007ad2a1106b860e763c07'
---

ae09040e845e88874bfce7613ae34a6ae183df7f