From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 17 Aug 2005 23:26:38 +0000 (+0000)
Subject: merge of 5e74415fe54cee50b20464dc706894370da0035d
X-Git-Tag: Release-2010-05/1~9453^2~3892
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=539c6c0d692ec97203e3591adb0f1d6727a19bbc;p=openembedded.git

merge of 5e74415fe54cee50b20464dc706894370da0035d
     and 88ec6577590d2a32da1f0361e44909b45f05899f
---

539c6c0d692ec97203e3591adb0f1d6727a19bbc