From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 7 Sep 2005 23:26:21 +0000 (+0000)
Subject: merge of 2ca1f9659bc04e69f377b91c15db406518d31e2e
X-Git-Tag: Release-2010-05/1~9453^2~3595^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1541e71a1a8dec1db567a9592bf7ad25776fccc;p=openembedded.git

merge of 2ca1f9659bc04e69f377b91c15db406518d31e2e
     and a1e17a5d7e46806b4e9ec3ded69b419eed479b4d
---

c1541e71a1a8dec1db567a9592bf7ad25776fccc