From: Philip Balister <philip@balister.org>
Date: Tue, 17 Oct 2006 19:21:47 +0000 (+0000)
Subject: merge of '517f7efe4d85e8dee36a5d83f349ea374199c9e0'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~120
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56d9a2fde5159c11977d29dcb60fcbfd3359480f;p=openembedded.git

Merge ... '517f7efe4d85e8dee36a5d83f349ea374199c9e0'
     and '9b4f11293547436ccf8d5e05c97485205a9d168b'
---

56d9a2fde5159c11977d29dcb60fcbfd3359480f