From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 4 Apr 2006 17:37:36 +0000 (+0000)
Subject: merge of a7533fe1dde530db43cb0e31307632437139f2af
X-Git-Tag: Release-2010-05/1~9453^2~2102^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4472a7d1c2687e2dad791557ba3a63bcb7281ce;p=openembedded.git

merge of a7533fe1dde530db43cb0e31307632437139f2af
     and d48f265f263a5f969f2abfd913a09b91a51a701f
---

a4472a7d1c2687e2dad791557ba3a63bcb7281ce