From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 8 Feb 2006 21:29:40 +0000 (+0000)
Subject: merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
X-Git-Tag: Release-2010-05/1~9453^2~2385^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce78c07e9a4e1eaa7b88bab0310f798a32ef0c99;p=openembedded.git

merge of 3b1e5467e63df0caf15791330cc41c5557e0eedd
     and 7ee355e4a1fa85e49dcae218d1aa5b884f75a6e7
---

ce78c07e9a4e1eaa7b88bab0310f798a32ef0c99