From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 21 Mar 2007 19:11:00 +0000 (+0000)
Subject: merge of '34962ef398e90928f67f478c73011580d467dd42'
X-Git-Tag: Release-2010-05/1~8868^2~1032^2~4^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4625f851bf016f8b2d2ef70af2e7ab9cf7b78094;p=openembedded.git

Merge ... '34962ef398e90928f67f478c73011580d467dd42'
     and 'b253d9dbb8096855329df47fa0e89d598c7c9fb2'
---

4625f851bf016f8b2d2ef70af2e7ab9cf7b78094