From: Philip Balister <philip@balister.org>
Date: Wed, 30 Jul 2008 13:52:08 +0000 (+0000)
Subject: merge of '648476e08584946c4059307fb756f1cd7f7fa603'
X-Git-Tag: Release-2010-05/1~6429
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=885277209e0653dcb15b44f64ccf49adb87d6e7d;p=openembedded.git

Merge ... '648476e08584946c4059307fb756f1cd7f7fa603'
     and 'eb28dc45b262f9456efc6bd50fbcf80645179f8f'
---

885277209e0653dcb15b44f64ccf49adb87d6e7d