From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 3 Dec 2007 12:39:13 +0000 (+0000)
Subject: merge of '68aa05a27b74404294762466c39e227edc79211e'
X-Git-Tag: Release-2010-05/1~8236^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=302ee217704be5c57b4af6da80cff269916409e6;p=openembedded.git

Merge ... '68aa05a27b74404294762466c39e227edc79211e'
     and 'e604e228e5352abcedfc1416e27044c35e049d64'
---

302ee217704be5c57b4af6da80cff269916409e6