From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 19 Mar 2007 16:01:16 +0000 (+0000)
Subject: merge of '301b5f25d70581b16e0309f3f3629def0c5d13f6'
X-Git-Tag: Release-2010-05/1~8868^2~1057
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa552ca1705f98a773add4dae8f238863fab206d;p=openembedded.git

Merge ... '301b5f25d70581b16e0309f3f3629def0c5d13f6'
     and '9e9a261db34253d39082761bf177e0bd288d3864'
---

fa552ca1705f98a773add4dae8f238863fab206d