From: Matt Reimer <mattjreimer@gmail.com>
Date: Thu, 22 Feb 2007 22:18:44 +0000 (+0000)
Subject: merge of '7bd9b617a6b57c3119453e5a6b2ae93264ba00a6'
X-Git-Tag: Release-2010-05/1~8868^2~1032^2~3^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f426db8bc67bd097def12ae78b04e0a7867e2b6c;p=openembedded.git

Merge ... '7bd9b617a6b57c3119453e5a6b2ae93264ba00a6'
     and 'f0e14f6fbf3cd741a3cc6c024f5e9f8fe95247a6'
---

f426db8bc67bd097def12ae78b04e0a7867e2b6c