From: Matt Reimer <mattjreimer@gmail.com>
Date: Fri, 5 Jan 2007 21:56:31 +0000 (+0000)
Subject: merge of '629d7abe4cdeb66f4256659308d040ed78152a2a'
X-Git-Tag: Release-2010-05/1~8868^2~1032^2~3^2^2^2~3^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5557dc80628a0a2d304fbf538e20ec3f08bb09db;p=openembedded.git

Merge ... '629d7abe4cdeb66f4256659308d040ed78152a2a'
     and 'b754a5f0be53db4b76ca4b5e9313be732e56d8dc'
---

5557dc80628a0a2d304fbf538e20ec3f08bb09db