From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 8 Feb 2006 22:25:05 +0000 (+0000)
Subject: merge of 543d2c7b9a975cffb6059cf1e427f5f71ef9498e
X-Git-Tag: Release-2010-05/1~9453^2~2385
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8689b67e27766a6ff5efc3629e987118be5b6df2;p=openembedded.git

merge of 543d2c7b9a975cffb6059cf1e427f5f71ef9498e
     and fa4d0967956da9fa067530a3796c20a1b3451489
---

8689b67e27766a6ff5efc3629e987118be5b6df2