From: Matt Reimer <mattjreimer@gmail.com>
Date: Tue, 14 Nov 2006 19:53:02 +0000 (+0000)
Subject: merge of '0522ce6e18539b2787b0461c02f133fb7067acc9'
X-Git-Tag: Release-2010-05/1~9455^2~495^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=188283505fbdd128396b366912974fc79d407d83;p=openembedded.git

Merge ... '0522ce6e18539b2787b0461c02f133fb7067acc9'
     and 'ed6e67aa7fd65b6d6d815724100fcd050742b0f6'
---

188283505fbdd128396b366912974fc79d407d83