From: Shane Volpe <shanevolpe@gmail.com>
Date: Thu, 1 Mar 2007 17:23:44 +0000 (+0000)
Subject: merge of '69fb969925906e0e00c2849db3f9f64239b2e501'
X-Git-Tag: Release-2010-05/1~9126^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1d969a24f5a19ec242f4cb7d9f862996798f573;p=openembedded.git

Merge ... '69fb969925906e0e00c2849db3f9f64239b2e501'
     and 'b9a3f8ec3a27f4ccaa24db092b62f6a964807b99'
---

f1d969a24f5a19ec242f4cb7d9f862996798f573