From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 7 Oct 2005 23:08:40 +0000 (+0000)
Subject: merge of 188899a39ad7b9fa56483bbf49b6b859ecc6e093
X-Git-Tag: Release-2010-05/1~9453^2~3319
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=075ae270c50ab662a6b6f61e7af5333b1da00901;p=openembedded.git

merge of 188899a39ad7b9fa56483bbf49b6b859ecc6e093
     and ec89fc8d46b882e4c955d663aca4d4ce85552700
---

075ae270c50ab662a6b6f61e7af5333b1da00901