From: Justin Patrin <papercrane@gmail.com>
Date: Thu, 1 Sep 2005 17:01:09 +0000 (+0000)
Subject: merge of 0875a62d1c0833c8b7734c612ecec134c8480059
X-Git-Tag: Release-2010-05/1~9453^2~3649^2~24
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b231a27a5698556cd35502858bb0cd99088a875e;p=openembedded.git

merge of 0875a62d1c0833c8b7734c612ecec134c8480059
     and 9720740dd02d20f4f561a98498566085a8709d14
---

b231a27a5698556cd35502858bb0cd99088a875e