From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 20 Jan 2006 06:07:28 +0000 (+0000)
Subject: merge of 4d5b94a92602e5e257fa068651ecc2760fd67b44
X-Git-Tag: Release-2010-05/1~9453^2~2608^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=682392d5a31f31de779b6556829a7451dbf6e8d8;p=openembedded.git

merge of 4d5b94a92602e5e257fa068651ecc2760fd67b44
     and cccbd67a0ede7ae4d1db1f9c45f544ed28d0b294
---

682392d5a31f31de779b6556829a7451dbf6e8d8