From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 7 Feb 2006 22:19:05 +0000 (+0000)
Subject: merge of 12ad312536380ea2dc9169b7d73257f999484105
X-Git-Tag: Release-2010-05/1~9453^2~2407^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10da525f08277902dfccc92a7310e7d337a9d626;p=openembedded.git

merge of 12ad312536380ea2dc9169b7d73257f999484105
     and 21ab572cc3967a02344791cb310b14cf5beb5d4f
---

10da525f08277902dfccc92a7310e7d337a9d626