From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 15 Nov 2006 22:46:44 +0000 (+0000)
Subject: merge of '2bca6e25fe69490be6f9ac7ad3fa27491ca1298e'
X-Git-Tag: Release-2010-05/1~9453^2~465^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da7c6ec1d33c3159683a9c79734f0dc4e66a4f7c;p=openembedded.git

Merge ... '2bca6e25fe69490be6f9ac7ad3fa27491ca1298e'
     and '3ab6e5380059008d97ce4f94d05e71e71cfc7b2d'
---

da7c6ec1d33c3159683a9c79734f0dc4e66a4f7c