From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 1 Jun 2007 06:56:18 +0000 (+0000)
Subject: merge of '48538c8eb890138522fdaa67c07c26e8dccd5419'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~106^2~17
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a6a9de6d749394b2584e3ed9fbf7155bad16057;p=openembedded.git

Merge ... '48538c8eb890138522fdaa67c07c26e8dccd5419'
     and '73c801b307019899c3255b427e2bb7cb896f8375'
---

2a6a9de6d749394b2584e3ed9fbf7155bad16057