From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 17 Nov 2006 15:46:33 +0000 (+0000)
Subject: merge of 'e5da8f4ab8c8240d2eee77d2cf6860c91f068802'
X-Git-Tag: Release-2010-05/1~9453^2~434^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ae9c99c404d7499f93b7d6bbc857ee92e1e8c39;p=openembedded.git

Merge ... 'e5da8f4ab8c8240d2eee77d2cf6860c91f068802'
     and 'f234436408b3639fb2d9759caab0196629090f31'
---

8ae9c99c404d7499f93b7d6bbc857ee92e1e8c39