From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 11 Feb 2006 21:33:12 +0000 (+0000)
Subject: merge of 52ebd988f59f6be0851649e3d117ae3734e87b4f
X-Git-Tag: Release-2010-05/1~9453^2~2371^2~20^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b91a2a99171cef31ac7a7e4e277fde656f0efaca;p=openembedded.git

merge of 52ebd988f59f6be0851649e3d117ae3734e87b4f
     and ab5c1cdb1ec2745a8a648c55a1738863c84ce2a6
---

b91a2a99171cef31ac7a7e4e277fde656f0efaca