From: Todd Blumer <todd@sdgsystems.com>
Date: Fri, 20 Jul 2007 23:11:29 +0000 (+0000)
Subject: merge of '8d9f1c0adaea2946d1c6e57e528158c450e0a626'
X-Git-Tag: Release-2010-05/1~8868^2~120^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faf9d7858821e90d201877804ddb2f56b10eed6f;p=openembedded.git

Merge ... '8d9f1c0adaea2946d1c6e57e528158c450e0a626'
     and '9312d5d8cc0db3acb8eb0cb2429fe1e78ff89299'
---

faf9d7858821e90d201877804ddb2f56b10eed6f