From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 29 Aug 2006 16:21:51 +0000 (+0000)
Subject: merge of '1f105f36299c6054d7758befecdb4b1b4f596b6e'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5df584057ea666a0461f695c00d882d46ec8cd3b;p=openembedded.git

Merge ... '1f105f36299c6054d7758befecdb4b1b4f596b6e'
     and '4d391acc34407b3bf053f8ca785f9789943953da'
---

5df584057ea666a0461f695c00d882d46ec8cd3b